git-archimport.html - external/gitster/git-htmldocs - Git at Google

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
  "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <meta name="generator" content="AsciiDoc 7.0.2" />
 <style type="text/css">
 /* Debug borders */
 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
 /*
  border: 1px solid red;
 */
 }

 body {
  margin: 1em 5% 1em 5%;
 }

 a { color: blue; }
 a:visited { color: fuchsia; }

 em {
  font-style: italic;
 }

 strong {
  font-weight: bold;
 }

 tt {
  color: navy;
 }

 h1, h2, h3, h4, h5, h6 {
  color: #527bbd;
  font-family: sans-serif;
  margin-top: 1.2em;
  margin-bottom: 0.5em;
  line-height: 1.3;
 }

 h1 {
  border-bottom: 2px solid silver;
 }
 h2 {
  border-bottom: 2px solid silver;
  padding-top: 0.5em;
 }

 div.sectionbody {
  font-family: serif;
  margin-left: 0;
 }

 hr {
  border: 1px solid silver;
 }

 p {
  margin-top: 0.5em;
  margin-bottom: 0.5em;
 }

 pre {
  padding: 0;
  margin: 0;
 }

 span#author {
  color: #527bbd;
  font-family: sans-serif;
  font-weight: bold;
  font-size: 1.2em;
 }
 span#email {
 }
 span#revision {
  font-family: sans-serif;
 }

 div#footer {
  font-family: sans-serif;
  font-size: small;
  border-top: 2px solid silver;
  padding-top: 0.5em;
  margin-top: 4.0em;
 }
 div#footer-text {
  float: left;
  padding-bottom: 0.5em;
 }
 div#footer-badges {
  float: right;
  padding-bottom: 0.5em;
 }

 div#preamble,
 div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
 div.admonitionblock {
  margin-right: 10%;
  margin-top: 1.5em;
  margin-bottom: 1.5em;
 }
 div.admonitionblock {
  margin-top: 2.5em;
  margin-bottom: 2.5em;
 }

 div.content { /* Block element content. */
  padding: 0;
 }

 /* Block element titles. */
 div.title, caption.title {
  font-family: sans-serif;
  font-weight: bold;
  text-align: left;
  margin-top: 1.0em;
  margin-bottom: 0.5em;
 }
 div.title + * {
  margin-top: 0;
 }

 td div.title:first-child {
  margin-top: 0.0em;
 }
 div.content div.title:first-child {
  margin-top: 0.0em;
 }
 div.content + div.title {
  margin-top: 0.0em;
 }

 div.sidebarblock > div.content {
  background: #ffffee;
  border: 1px solid silver;
  padding: 0.5em;
 }

 div.listingblock > div.content {
  border: 1px solid silver;
  background: #f4f4f4;
  padding: 0.5em;
 }

 div.quoteblock > div.content {
  padding-left: 2.0em;
 }
 div.quoteblock .attribution {
  text-align: right;
 }

 div.admonitionblock .icon {
  vertical-align: top;
  font-size: 1.1em;
  font-weight: bold;
  text-decoration: underline;
  color: #527bbd;
  padding-right: 0.5em;
 }
 div.admonitionblock td.content {
  padding-left: 0.5em;
  border-left: 2px solid silver;
 }

 div.exampleblock > div.content {
  border-left: 2px solid silver;
  padding: 0.5em;
 }

 div.verseblock div.content {
  white-space: pre;
 }

 div.imageblock div.content { padding-left: 0; }
 div.imageblock img { border: 1px solid silver; }
 span.image img { border-style: none; }

 dl {
  margin-top: 0.8em;
  margin-bottom: 0.8em;
 }
 dt {
  margin-top: 0.5em;
  margin-bottom: 0;
  font-style: italic;
 }
 dd > *:first-child {
  margin-top: 0;
 }

 ul, ol {
  list-style-position: outside;
 }
 ol.olist2 {
  list-style-type: lower-alpha;
 }

 div.tableblock > table {
  border-color: #527bbd;
  border-width: 3px;
 }
 thead {
  font-family: sans-serif;
  font-weight: bold;
 }
 tfoot {
  font-weight: bold;
 }

 div.hlist {
  margin-top: 0.8em;
  margin-bottom: 0.8em;
 }
 td.hlist1 {
  vertical-align: top;
  font-style: italic;
  padding-right: 0.8em;
 }
 td.hlist2 {
  vertical-align: top;
 }

 @media print {
  div#footer-badges { display: none; }
 }
 include::./stylesheets/xhtml11-manpage.css[]
 /* Workarounds for IE6's broken and incomplete CSS2. */

 div.sidebar-content {
  background: #ffffee;
  border: 1px solid silver;
  padding: 0.5em;
 }
 div.sidebar-title, div.image-title {
  font-family: sans-serif;
  font-weight: bold;
  margin-top: 0.0em;
  margin-bottom: 0.5em;
 }

 div.listingblock div.content {
  border: 1px solid silver;
  background: #f4f4f4;
  padding: 0.5em;
 }

 div.quoteblock-content {
  padding-left: 2.0em;
 }

 div.exampleblock-content {
  border-left: 2px solid silver;
  padding-left: 0.5em;
 }
 </style>
 <title>git-archimport(1)</title>
 </head>
 <body>
 <div id="header">
 <h1>
 git-archimport(1) Manual Page
 </h1>
 <h2>NAME</h2>
 <div class="sectionbody">
 <p>git-archimport -
  Import an Arch repository into git
 </p>
 </div>
 </div>
 <h2>SYNOPSIS</h2>
 <div class="sectionbody">
 <div class="verseblock">
 <div class="content"><em>git-archimport</em> [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir]
  &lt;archive/branch&gt; [ &lt;archive/branch&gt; ]</div></div>
 </div>
 <h2>DESCRIPTION</h2>
 <div class="sectionbody">
 <p>Imports a project from one or more Arch repositories. It will follow branches
 and repositories within the namespaces defined by the &lt;archive/branch&gt;
 parameters supplied. If it cannot find the remote branch a merge comes from
 it will just import it as a regular commit. If it can find it, it will mark it
 as a merge whenever possible (see discussion below).</p>
 <p>The script expects you to provide the key roots where it can start the import
 from an <em>initial import</em> or <em>tag</em> type of Arch commit. It will follow and
 import new branches within the provided roots.</p>
 <p>It expects to be dealing with one project only. If it sees
 branches that have different roots, it will refuse to run. In that case,
 edit your &lt;archive/branch&gt; parameters to define clearly the scope of the
 import.</p>
 <p><tt>git-archimport</tt> uses <tt>tla</tt> extensively in the background to access the
 Arch repository.
 Make sure you have a recent version of <tt>tla</tt> available in the path. <tt>tla</tt> must
 know about the repositories you pass to <tt>git-archimport</tt>.</p>
 <p>For the initial import <tt>git-archimport</tt> expects to find itself in an empty
 directory. To follow the development of a project that uses Arch, rerun
 <tt>git-archimport</tt> with the same parameters as the initial import to perform
 incremental imports.</p>
 </div>
 <h2>MERGES</h2>
 <div class="sectionbody">
 <p>Patch merge data from Arch is used to mark merges in git as well. git
 does not care much about tracking patches, and only considers a merge when a
 branch incorporates all the commits since the point they forked. The end result
 is that git will have a good idea of how far branches have diverged. So the
 import process does lose some patch-trading metadata.</p>
 <p>Fortunately, when you try and merge branches imported from Arch,
 git will find a good merge base, and it has a good chance of identifying
 patches that have been traded out-of-sequence between the branches.</p>
 </div>
 <h2>OPTIONS</h2>
 <div class="sectionbody">
 <dl>
 <dt>
 -h
 </dt>
 <dd>
 <p>
  Display usage.
 </p>
 </dd>
 <dt>
 -v
 </dt>
 <dd>
 <p>
  Verbose output.
 </p>
 </dd>
 <dt>
 -T
 </dt>
 <dd>
 <p>
  Many tags. Will create a tag for every commit, reflecting the commit
  name in the Arch repository.
 </p>
 </dd>
 <dt>
 -f
 </dt>
 <dd>
 <p>
  Use the fast patchset import strategy. This can be significantly
  faster for large trees, but cannot handle directory renames or
  permissions changes. The default strategy is slow and safe.
 </p>
 </dd>
 <dt>
 -o
 </dt>
 <dd>
 <p>
  Use this for compatibility with old-style branch names used by
  earlier versions of git-archimport. Old-style branch names
  were category--branch, whereas new-style branch names are
  archive,category--branch--version.
 </p>
 </dd>
 <dt>
 -D &lt;depth&gt;
 </dt>
 <dd>
 <p>
  Follow merge ancestry and attempt to import trees that have been
  merged from. Specify a depth greater than 1 if patch logs have been
  pruned.
 </p>
 </dd>
 <dt>
 -a
 </dt>
 <dd>
 <p>
  Attempt to auto-register archives at http://mirrors.sourcecontrol.net
  This is particularly useful with the -D option.
 </p>
 </dd>
 <dt>
 -t &lt;tmpdir&gt;
 </dt>
 <dd>
 <p>
  Override the default tempdir.
 </p>
 </dd>
 <dt>
 &lt;archive/branch&gt;
 </dt>
 <dd>
 <p>
  Archive/branch identifier in a format that <tt>tla log</tt> understands.
 </p>
 </dd>
 </dl>
 </div>
 <h2>Author</h2>
 <div class="sectionbody">
 <p>Written by Martin Langhoff &lt;martin@catalyst.net.nz&gt;.</p>
 </div>
 <h2>Documentation</h2>
 <div class="sectionbody">
 <p>Documentation by Junio C Hamano, Martin Langhoff and the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
 <p>Part of the <a href="git.html">git(7)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
 Last updated 03-Oct-2006 08:40:52 UTC
 </div>
 </div>
 </body>
 </html>
	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
	"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
	<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
	<head>
	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
	<meta name="generator" content="AsciiDoc 7.0.2" />
	<style type="text/css">
	/* Debug borders */
	p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
	/*
	border: 1px solid red;
	*/
	}

	body {
	margin: 1em 5% 1em 5%;
	}

	a { color: blue; }
	a:visited { color: fuchsia; }

	em {
	font-style: italic;
	}

	strong {
	font-weight: bold;
	}

	tt {
	color: navy;
	}

	h1, h2, h3, h4, h5, h6 {
	color: #527bbd;
	font-family: sans-serif;
	margin-top: 1.2em;
	margin-bottom: 0.5em;
	line-height: 1.3;
	}

	h1 {
	border-bottom: 2px solid silver;
	}
	h2 {
	border-bottom: 2px solid silver;
	padding-top: 0.5em;
	}

	div.sectionbody {
	font-family: serif;
	margin-left: 0;
	}

	hr {
	border: 1px solid silver;
	}

	p {
	margin-top: 0.5em;
	margin-bottom: 0.5em;
	}

	pre {
	padding: 0;
	margin: 0;
	}

	span#author {
	color: #527bbd;
	font-family: sans-serif;
	font-weight: bold;
	font-size: 1.2em;
	}
	span#email {
	}
	span#revision {
	font-family: sans-serif;
	}

	div#footer {
	font-family: sans-serif;
	font-size: small;
	border-top: 2px solid silver;
	padding-top: 0.5em;
	margin-top: 4.0em;
	}
	div#footer-text {
	float: left;
	padding-bottom: 0.5em;
	}
	div#footer-badges {
	float: right;
	padding-bottom: 0.5em;
	}

	div#preamble,
	div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
	div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
	div.admonitionblock {
	margin-right: 10%;
	margin-top: 1.5em;
	margin-bottom: 1.5em;
	}
	div.admonitionblock {
	margin-top: 2.5em;
	margin-bottom: 2.5em;
	}

	div.content { /* Block element content. */
	padding: 0;
	}

	/* Block element titles. */
	div.title, caption.title {
	font-family: sans-serif;
	font-weight: bold;
	text-align: left;
	margin-top: 1.0em;
	margin-bottom: 0.5em;
	}
	div.title + * {
	margin-top: 0;
	}

	td div.title:first-child {
	margin-top: 0.0em;
	}
	div.content div.title:first-child {
	margin-top: 0.0em;
	}
	div.content + div.title {
	margin-top: 0.0em;
	}

	div.sidebarblock > div.content {
	background: #ffffee;
	border: 1px solid silver;
	padding: 0.5em;
	}

	div.listingblock > div.content {
	border: 1px solid silver;
	background: #f4f4f4;
	padding: 0.5em;
	}

	div.quoteblock > div.content {
	padding-left: 2.0em;
	}
	div.quoteblock .attribution {
	text-align: right;
	}

	div.admonitionblock .icon {
	vertical-align: top;
	font-size: 1.1em;
	font-weight: bold;
	text-decoration: underline;
	color: #527bbd;
	padding-right: 0.5em;
	}
	div.admonitionblock td.content {
	padding-left: 0.5em;
	border-left: 2px solid silver;
	}

	div.exampleblock > div.content {
	border-left: 2px solid silver;
	padding: 0.5em;
	}

	div.verseblock div.content {
	white-space: pre;
	}

	div.imageblock div.content { padding-left: 0; }
	div.imageblock img { border: 1px solid silver; }
	span.image img { border-style: none; }

	dl {
	margin-top: 0.8em;
	margin-bottom: 0.8em;
	}
	dt {
	margin-top: 0.5em;
	margin-bottom: 0;
	font-style: italic;
	}
	dd > *:first-child {
	margin-top: 0;
	}

	ul, ol {
	list-style-position: outside;
	}
	ol.olist2 {
	list-style-type: lower-alpha;
	}

	div.tableblock > table {
	border-color: #527bbd;
	border-width: 3px;
	}
	thead {
	font-family: sans-serif;
	font-weight: bold;
	}
	tfoot {
	font-weight: bold;
	}

	div.hlist {
	margin-top: 0.8em;
	margin-bottom: 0.8em;
	}
	td.hlist1 {
	vertical-align: top;
	font-style: italic;
	padding-right: 0.8em;
	}
	td.hlist2 {
	vertical-align: top;
	}

	@media print {
	div#footer-badges { display: none; }
	}
	include::./stylesheets/xhtml11-manpage.css[]
	/* Workarounds for IE6's broken and incomplete CSS2. */

	div.sidebar-content {
	background: #ffffee;
	border: 1px solid silver;
	padding: 0.5em;
	}
	div.sidebar-title, div.image-title {
	font-family: sans-serif;
	font-weight: bold;
	margin-top: 0.0em;
	margin-bottom: 0.5em;
	}

	div.listingblock div.content {
	border: 1px solid silver;
	background: #f4f4f4;
	padding: 0.5em;
	}

	div.quoteblock-content {
	padding-left: 2.0em;
	}

	div.exampleblock-content {
	border-left: 2px solid silver;
	padding-left: 0.5em;
	}
	</style>
	<title>git-archimport(1)</title>
	</head>
	<body>
	<div id="header">
	<h1>
	git-archimport(1) Manual Page
	</h1>
	<h2>NAME</h2>
	<div class="sectionbody">
	<p>git-archimport -
	Import an Arch repository into git
	</p>
	</div>
	</div>
	<h2>SYNOPSIS</h2>
	<div class="sectionbody">
	<div class="verseblock">
	<div class="content"><em>git-archimport</em> [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir]
	<archive/branch> [ <archive/branch> ]</div></div>
	</div>
	<h2>DESCRIPTION</h2>
	<div class="sectionbody">
	<p>Imports a project from one or more Arch repositories. It will follow branches
	and repositories within the namespaces defined by the <archive/branch>
	parameters supplied. If it cannot find the remote branch a merge comes from
	it will just import it as a regular commit. If it can find it, it will mark it
	as a merge whenever possible (see discussion below).</p>
	<p>The script expects you to provide the key roots where it can start the import
	from an <em>initial import</em> or <em>tag</em> type of Arch commit. It will follow and
	import new branches within the provided roots.</p>
	<p>It expects to be dealing with one project only. If it sees
	branches that have different roots, it will refuse to run. In that case,
	edit your <archive/branch> parameters to define clearly the scope of the
	import.</p>
	<p><tt>git-archimport</tt> uses <tt>tla</tt> extensively in the background to access the
	Arch repository.
	Make sure you have a recent version of <tt>tla</tt> available in the path. <tt>tla</tt> must
	know about the repositories you pass to <tt>git-archimport</tt>.</p>
	<p>For the initial import <tt>git-archimport</tt> expects to find itself in an empty
	directory. To follow the development of a project that uses Arch, rerun
	<tt>git-archimport</tt> with the same parameters as the initial import to perform
	incremental imports.</p>
	</div>
	<h2>MERGES</h2>
	<div class="sectionbody">
	<p>Patch merge data from Arch is used to mark merges in git as well. git
	does not care much about tracking patches, and only considers a merge when a
	branch incorporates all the commits since the point they forked. The end result
	is that git will have a good idea of how far branches have diverged. So the
	import process does lose some patch-trading metadata.</p>
	<p>Fortunately, when you try and merge branches imported from Arch,
	git will find a good merge base, and it has a good chance of identifying
	patches that have been traded out-of-sequence between the branches.</p>
	</div>
	<h2>OPTIONS</h2>
	<div class="sectionbody">
	<dl>
	<dt>
	-h
	</dt>
	<dd>
	<p>
	Display usage.
	</p>
	</dd>
	<dt>
	-v
	</dt>
	<dd>
	<p>
	Verbose output.
	</p>
	</dd>
	<dt>
	-T
	</dt>
	<dd>
	<p>
	Many tags. Will create a tag for every commit, reflecting the commit
	name in the Arch repository.
	</p>
	</dd>
	<dt>
	-f
	</dt>
	<dd>
	<p>
	Use the fast patchset import strategy. This can be significantly
	faster for large trees, but cannot handle directory renames or
	permissions changes. The default strategy is slow and safe.
	</p>
	</dd>
	<dt>
	-o
	</dt>
	<dd>
	<p>
	Use this for compatibility with old-style branch names used by
	earlier versions of git-archimport. Old-style branch names
	were category--branch, whereas new-style branch names are
	archive,category--branch--version.
	</p>
	</dd>
	<dt>
	-D <depth>
	</dt>
	<dd>
	<p>
	Follow merge ancestry and attempt to import trees that have been
	merged from. Specify a depth greater than 1 if patch logs have been
	pruned.
	</p>
	</dd>
	<dt>
	-a
	</dt>
	<dd>
	<p>
	Attempt to auto-register archives at http://mirrors.sourcecontrol.net
	This is particularly useful with the -D option.
	</p>
	</dd>
	<dt>
	-t <tmpdir>
	</dt>
	<dd>
	<p>
	Override the default tempdir.
	</p>
	</dd>
	<dt>
	<archive/branch>
	</dt>
	<dd>
	<p>
	Archive/branch identifier in a format that <tt>tla log</tt> understands.
	</p>
	</dd>
	</dl>
	</div>
	<h2>Author</h2>
	<div class="sectionbody">
	<p>Written by Martin Langhoff <martin@catalyst.net.nz>.</p>
	</div>
	<h2>Documentation</h2>
	<div class="sectionbody">
	<p>Documentation by Junio C Hamano, Martin Langhoff and the git-list <git@vger.kernel.org>.</p>
	</div>
	<h2>GIT</h2>
	<div class="sectionbody">
	<p>Part of the <a href="git.html">git(7)</a> suite</p>
	</div>
	<div id="footer">
	<div id="footer-text">
	Last updated 03-Oct-2006 08:40:52 UTC
	</div>
	</div>
	</body>
	</html>