Autogenerated HTML docs for v1.7.4.1-294-gaf4c
[git/jnareb-git.git] / git-archimport.html
blobc5204ac8a83205b56a92e5c25d0374cbc223b5bc
1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
4 <head>
5 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
6 <meta name="generator" content="AsciiDoc 8.4.5" />
7 <title>git-archimport(1)</title>
8 <style type="text/css">
9 /* Debug borders */
10 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
12 border: 1px solid red;
16 body {
17 margin: 1em 5% 1em 5%;
20 a {
21 color: blue;
22 text-decoration: underline;
24 a:visited {
25 color: fuchsia;
28 em {
29 font-style: italic;
30 color: navy;
33 strong {
34 font-weight: bold;
35 color: #083194;
38 tt {
39 color: navy;
42 h1, h2, h3, h4, h5, h6 {
43 color: #527bbd;
44 font-family: sans-serif;
45 margin-top: 1.2em;
46 margin-bottom: 0.5em;
47 line-height: 1.3;
50 h1, h2, h3 {
51 border-bottom: 2px solid silver;
53 h2 {
54 padding-top: 0.5em;
56 h3 {
57 float: left;
59 h3 + * {
60 clear: left;
63 div.sectionbody {
64 font-family: serif;
65 margin-left: 0;
68 hr {
69 border: 1px solid silver;
72 p {
73 margin-top: 0.5em;
74 margin-bottom: 0.5em;
77 ul, ol, li > p {
78 margin-top: 0;
81 pre {
82 padding: 0;
83 margin: 0;
86 span#author {
87 color: #527bbd;
88 font-family: sans-serif;
89 font-weight: bold;
90 font-size: 1.1em;
92 span#email {
94 span#revnumber, span#revdate, span#revremark {
95 font-family: sans-serif;
98 div#footer {
99 font-family: sans-serif;
100 font-size: small;
101 border-top: 2px solid silver;
102 padding-top: 0.5em;
103 margin-top: 4.0em;
105 div#footer-text {
106 float: left;
107 padding-bottom: 0.5em;
109 div#footer-badges {
110 float: right;
111 padding-bottom: 0.5em;
114 div#preamble {
115 margin-top: 1.5em;
116 margin-bottom: 1.5em;
118 div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
119 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
120 div.admonitionblock {
121 margin-top: 1.5em;
122 margin-bottom: 1.5em;
124 div.admonitionblock {
125 margin-top: 2.5em;
126 margin-bottom: 2.5em;
129 div.content { /* Block element content. */
130 padding: 0;
133 /* Block element titles. */
134 div.title, caption.title {
135 color: #527bbd;
136 font-family: sans-serif;
137 font-weight: bold;
138 text-align: left;
139 margin-top: 1.0em;
140 margin-bottom: 0.5em;
142 div.title + * {
143 margin-top: 0;
146 td div.title:first-child {
147 margin-top: 0.0em;
149 div.content div.title:first-child {
150 margin-top: 0.0em;
152 div.content + div.title {
153 margin-top: 0.0em;
156 div.sidebarblock > div.content {
157 background: #ffffee;
158 border: 1px solid silver;
159 padding: 0.5em;
162 div.listingblock > div.content {
163 border: 1px solid silver;
164 background: #f4f4f4;
165 padding: 0.5em;
168 div.quoteblock {
169 padding-left: 2.0em;
170 margin-right: 10%;
172 div.quoteblock > div.attribution {
173 padding-top: 0.5em;
174 text-align: right;
177 div.verseblock {
178 padding-left: 2.0em;
179 margin-right: 10%;
181 div.verseblock > div.content {
182 white-space: pre;
184 div.verseblock > div.attribution {
185 padding-top: 0.75em;
186 text-align: left;
188 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
189 div.verseblock + div.attribution {
190 text-align: left;
193 div.admonitionblock .icon {
194 vertical-align: top;
195 font-size: 1.1em;
196 font-weight: bold;
197 text-decoration: underline;
198 color: #527bbd;
199 padding-right: 0.5em;
201 div.admonitionblock td.content {
202 padding-left: 0.5em;
203 border-left: 2px solid silver;
206 div.exampleblock > div.content {
207 border-left: 2px solid silver;
208 padding: 0.5em;
211 div.imageblock div.content { padding-left: 0; }
212 span.image img { border-style: none; }
213 a.image:visited { color: white; }
215 dl {
216 margin-top: 0.8em;
217 margin-bottom: 0.8em;
219 dt {
220 margin-top: 0.5em;
221 margin-bottom: 0;
222 font-style: normal;
223 color: navy;
225 dd > *:first-child {
226 margin-top: 0.1em;
229 ul, ol {
230 list-style-position: outside;
232 ol.arabic {
233 list-style-type: decimal;
235 ol.loweralpha {
236 list-style-type: lower-alpha;
238 ol.upperalpha {
239 list-style-type: upper-alpha;
241 ol.lowerroman {
242 list-style-type: lower-roman;
244 ol.upperroman {
245 list-style-type: upper-roman;
248 div.compact ul, div.compact ol,
249 div.compact p, div.compact p,
250 div.compact div, div.compact div {
251 margin-top: 0.1em;
252 margin-bottom: 0.1em;
255 div.tableblock > table {
256 border: 3px solid #527bbd;
258 thead {
259 font-family: sans-serif;
260 font-weight: bold;
262 tfoot {
263 font-weight: bold;
265 td > div.verse {
266 white-space: pre;
268 p.table {
269 margin-top: 0;
271 /* Because the table frame attribute is overriden by CSS in most browsers. */
272 div.tableblock > table[frame="void"] {
273 border-style: none;
275 div.tableblock > table[frame="hsides"] {
276 border-left-style: none;
277 border-right-style: none;
279 div.tableblock > table[frame="vsides"] {
280 border-top-style: none;
281 border-bottom-style: none;
285 div.hdlist {
286 margin-top: 0.8em;
287 margin-bottom: 0.8em;
289 div.hdlist tr {
290 padding-bottom: 15px;
292 dt.hdlist1.strong, td.hdlist1.strong {
293 font-weight: bold;
295 td.hdlist1 {
296 vertical-align: top;
297 font-style: normal;
298 padding-right: 0.8em;
299 color: navy;
301 td.hdlist2 {
302 vertical-align: top;
304 div.hdlist.compact tr {
305 margin: 0;
306 padding-bottom: 0;
309 .comment {
310 background: yellow;
313 @media print {
314 div#footer-badges { display: none; }
317 div#toctitle {
318 color: #527bbd;
319 font-family: sans-serif;
320 font-size: 1.1em;
321 font-weight: bold;
322 margin-top: 1.0em;
323 margin-bottom: 0.1em;
326 div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
327 margin-top: 0;
328 margin-bottom: 0;
330 div.toclevel2 {
331 margin-left: 2em;
332 font-size: 0.9em;
334 div.toclevel3 {
335 margin-left: 4em;
336 font-size: 0.9em;
338 div.toclevel4 {
339 margin-left: 6em;
340 font-size: 0.9em;
342 /* Overrides for manpage documents */
343 h1 {
344 padding-top: 0.5em;
345 padding-bottom: 0.5em;
346 border-top: 2px solid silver;
347 border-bottom: 2px solid silver;
349 h2 {
350 border-style: none;
352 div.sectionbody {
353 margin-left: 5%;
356 @media print {
357 div#toc { display: none; }
360 /* Workarounds for IE6's broken and incomplete CSS2. */
362 div.sidebar-content {
363 background: #ffffee;
364 border: 1px solid silver;
365 padding: 0.5em;
367 div.sidebar-title, div.image-title {
368 color: #527bbd;
369 font-family: sans-serif;
370 font-weight: bold;
371 margin-top: 0.0em;
372 margin-bottom: 0.5em;
375 div.listingblock div.content {
376 border: 1px solid silver;
377 background: #f4f4f4;
378 padding: 0.5em;
381 div.quoteblock-attribution {
382 padding-top: 0.5em;
383 text-align: right;
386 div.verseblock-content {
387 white-space: pre;
389 div.verseblock-attribution {
390 padding-top: 0.75em;
391 text-align: left;
394 div.exampleblock-content {
395 border-left: 2px solid silver;
396 padding-left: 0.5em;
399 /* IE6 sets dynamically generated links as visited. */
400 div#toc a:visited { color: blue; }
401 </style>
402 </head>
403 <body>
404 <div id="header">
405 <h1>
406 git-archimport(1) Manual Page
407 </h1>
408 <h2>NAME</h2>
409 <div class="sectionbody">
410 <p>git-archimport -
411 Import an Arch repository into git
412 </p>
413 </div>
414 </div>
415 <h2 id="_synopsis">SYNOPSIS</h2>
416 <div class="sectionbody">
417 <div class="verseblock">
418 <div class="verseblock-content"><em>git archimport</em> [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir]
419 &lt;archive/branch&gt;[:&lt;git-branch&gt;] &#8230;</div>
420 <div class="verseblock-attribution">
421 </div></div>
422 </div>
423 <h2 id="_description">DESCRIPTION</h2>
424 <div class="sectionbody">
425 <div class="paragraph"><p>Imports a project from one or more Arch repositories. It will follow branches
426 and repositories within the namespaces defined by the &lt;archive/branch&gt;
427 parameters supplied. If it cannot find the remote branch a merge comes from
428 it will just import it as a regular commit. If it can find it, it will mark it
429 as a merge whenever possible (see discussion below).</p></div>
430 <div class="paragraph"><p>The script expects you to provide the key roots where it can start the import
431 from an <em>initial import</em> or <em>tag</em> type of Arch commit. It will follow and
432 import new branches within the provided roots.</p></div>
433 <div class="paragraph"><p>It expects to be dealing with one project only. If it sees
434 branches that have different roots, it will refuse to run. In that case,
435 edit your &lt;archive/branch&gt; parameters to define clearly the scope of the
436 import.</p></div>
437 <div class="paragraph"><p><em>git archimport</em> uses <tt>tla</tt> extensively in the background to access the
438 Arch repository.
439 Make sure you have a recent version of <tt>tla</tt> available in the path. <tt>tla</tt> must
440 know about the repositories you pass to <em>git archimport</em>.</p></div>
441 <div class="paragraph"><p>For the initial import, <em>git archimport</em> expects to find itself in an empty
442 directory. To follow the development of a project that uses Arch, rerun
443 <em>git archimport</em> with the same parameters as the initial import to perform
444 incremental imports.</p></div>
445 <div class="paragraph"><p>While <em>git archimport</em> will try to create sensible branch names for the
446 archives that it imports, it is also possible to specify git branch names
447 manually. To do so, write a git branch name after each &lt;archive/branch&gt;
448 parameter, separated by a colon. This way, you can shorten the Arch
449 branch names and convert Arch jargon to git jargon, for example mapping a
450 "PROJECT&#45;&#45;devo&#45;&#45;VERSION" branch to "master".</p></div>
451 <div class="paragraph"><p>Associating multiple Arch branches to one git branch is possible; the
452 result will make the most sense only if no commits are made to the first
453 branch, after the second branch is created. Still, this is useful to
454 convert Arch repositories that had been rotated periodically.</p></div>
455 </div>
456 <h2 id="_merges">MERGES</h2>
457 <div class="sectionbody">
458 <div class="paragraph"><p>Patch merge data from Arch is used to mark merges in git as well. git
459 does not care much about tracking patches, and only considers a merge when a
460 branch incorporates all the commits since the point they forked. The end result
461 is that git will have a good idea of how far branches have diverged. So the
462 import process does lose some patch-trading metadata.</p></div>
463 <div class="paragraph"><p>Fortunately, when you try and merge branches imported from Arch,
464 git will find a good merge base, and it has a good chance of identifying
465 patches that have been traded out-of-sequence between the branches.</p></div>
466 </div>
467 <h2 id="_options">OPTIONS</h2>
468 <div class="sectionbody">
469 <div class="dlist"><dl>
470 <dt class="hdlist1">
472 </dt>
473 <dd>
475 Display usage.
476 </p>
477 </dd>
478 <dt class="hdlist1">
480 </dt>
481 <dd>
483 Verbose output.
484 </p>
485 </dd>
486 <dt class="hdlist1">
488 </dt>
489 <dd>
491 Many tags. Will create a tag for every commit, reflecting the commit
492 name in the Arch repository.
493 </p>
494 </dd>
495 <dt class="hdlist1">
497 </dt>
498 <dd>
500 Use the fast patchset import strategy. This can be significantly
501 faster for large trees, but cannot handle directory renames or
502 permissions changes. The default strategy is slow and safe.
503 </p>
504 </dd>
505 <dt class="hdlist1">
507 </dt>
508 <dd>
510 Use this for compatibility with old-style branch names used by
511 earlier versions of <em>git archimport</em>. Old-style branch names
512 were category&#45;&#45;branch, whereas new-style branch names are
513 archive,category&#45;&#45;branch&#45;&#45;version. In both cases, names given
514 on the command-line will override the automatically-generated
515 ones.
516 </p>
517 </dd>
518 <dt class="hdlist1">
519 -D &lt;depth&gt;
520 </dt>
521 <dd>
523 Follow merge ancestry and attempt to import trees that have been
524 merged from. Specify a depth greater than 1 if patch logs have been
525 pruned.
526 </p>
527 </dd>
528 <dt class="hdlist1">
530 </dt>
531 <dd>
533 Attempt to auto-register archives at <a href="http://mirrors.sourcecontrol.net">http://mirrors.sourcecontrol.net</a>
534 This is particularly useful with the -D option.
535 </p>
536 </dd>
537 <dt class="hdlist1">
538 -t &lt;tmpdir&gt;
539 </dt>
540 <dd>
542 Override the default tempdir.
543 </p>
544 </dd>
545 <dt class="hdlist1">
546 &lt;archive/branch&gt;
547 </dt>
548 <dd>
550 Archive/branch identifier in a format that <tt>tla log</tt> understands.
551 </p>
552 </dd>
553 </dl></div>
554 </div>
555 <h2 id="_git">GIT</h2>
556 <div class="sectionbody">
557 <div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
558 </div>
559 <div id="footer">
560 <div id="footer-text">
561 Last updated 2011-03-15 23:30:13 UTC
562 </div>
563 </div>
564 </body>
565 </html>