Google Git
Sign in
chromium / external / gitster / git-htmldocs / 31cca1669fe45cbdca5a7f6b888e9a1d04ee1f10 / . / git-archimport.html
blob: ae850ad80cb583c547e6376dec65b8d2b193e429 [file] [log] [blame]
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]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" />
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]6<meta name="generator" content="AsciiDoc 8.2.5" />
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]7<style type="text/css">
8/* Debug borders */
9p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
10/*
11 border: 1px solid red;
12*/
13}
14
15body {
16 margin: 1em 5% 1em 5%;
17}
18
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]19a {
20 color: blue;
21 text-decoration: underline;
22}
23a:visited {
24 color: fuchsia;
25}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]26
27em {
28 font-style: italic;
29}
30
31strong {
32 font-weight: bold;
33}
34
35tt {
36 color: navy;
37}
38
39h1, h2, h3, h4, h5, h6 {
40 color: #527bbd;
41 font-family: sans-serif;
42 margin-top: 1.2em;
43 margin-bottom: 0.5em;
44 line-height: 1.3;
45}
46
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]47h1, h2, h3 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]48 border-bottom: 2px solid silver;
49}
50h2 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]51 padding-top: 0.5em;
52}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]53h3 {
54 float: left;
55}
56h3 + * {
57 clear: left;
58}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]59
60div.sectionbody {
61 font-family: serif;
62 margin-left: 0;
63}
64
65hr {
66 border: 1px solid silver;
67}
68
69p {
70 margin-top: 0.5em;
71 margin-bottom: 0.5em;
72}
73
74pre {
75 padding: 0;
76 margin: 0;
77}
78
79span#author {
80 color: #527bbd;
81 font-family: sans-serif;
82 font-weight: bold;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]83 font-size: 1.1em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]84}
85span#email {
86}
87span#revision {
88 font-family: sans-serif;
89}
90
91div#footer {
92 font-family: sans-serif;
93 font-size: small;
94 border-top: 2px solid silver;
95 padding-top: 0.5em;
96 margin-top: 4.0em;
97}
98div#footer-text {
99 float: left;
100 padding-bottom: 0.5em;
101}
102div#footer-badges {
103 float: right;
104 padding-bottom: 0.5em;
105}
106
107div#preamble,
108div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
109div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
110div.admonitionblock {
111 margin-right: 10%;
112 margin-top: 1.5em;
113 margin-bottom: 1.5em;
114}
115div.admonitionblock {
116 margin-top: 2.5em;
117 margin-bottom: 2.5em;
118}
119
120div.content { /* Block element content. */
121 padding: 0;
122}
123
124/* Block element titles. */
125div.title, caption.title {
126 font-family: sans-serif;
127 font-weight: bold;
128 text-align: left;
129 margin-top: 1.0em;
130 margin-bottom: 0.5em;
131}
132div.title + * {
133 margin-top: 0;
134}
135
136td div.title:first-child {
137 margin-top: 0.0em;
138}
139div.content div.title:first-child {
140 margin-top: 0.0em;
141}
142div.content + div.title {
143 margin-top: 0.0em;
144}
145
146div.sidebarblock > div.content {
147 background: #ffffee;
148 border: 1px solid silver;
149 padding: 0.5em;
150}
151
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]152div.listingblock {
153 margin-right: 0%;
154}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]155div.listingblock > div.content {
156 border: 1px solid silver;
157 background: #f4f4f4;
158 padding: 0.5em;
159}
160
161div.quoteblock > div.content {
162 padding-left: 2.0em;
163}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]164
165div.attribution {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]166 text-align: right;
167}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]168div.verseblock + div.attribution {
169 text-align: left;
170}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]171
172div.admonitionblock .icon {
173 vertical-align: top;
174 font-size: 1.1em;
175 font-weight: bold;
176 text-decoration: underline;
177 color: #527bbd;
178 padding-right: 0.5em;
179}
180div.admonitionblock td.content {
181 padding-left: 0.5em;
182 border-left: 2px solid silver;
183}
184
185div.exampleblock > div.content {
186 border-left: 2px solid silver;
187 padding: 0.5em;
188}
189
190div.verseblock div.content {
191 white-space: pre;
192}
193
194div.imageblock div.content { padding-left: 0; }
195div.imageblock img { border: 1px solid silver; }
196span.image img { border-style: none; }
197
198dl {
199 margin-top: 0.8em;
200 margin-bottom: 0.8em;
201}
202dt {
203 margin-top: 0.5em;
204 margin-bottom: 0;
205 font-style: italic;
206}
207dd > *:first-child {
208 margin-top: 0;
209}
210
211ul, ol {
212 list-style-position: outside;
213}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]214div.olist2 ol {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]215 list-style-type: lower-alpha;
216}
217
218div.tableblock > table {
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]219 border: 3px solid #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]220}
221thead {
222 font-family: sans-serif;
223 font-weight: bold;
224}
225tfoot {
226 font-weight: bold;
227}
228
229div.hlist {
230 margin-top: 0.8em;
231 margin-bottom: 0.8em;
232}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]233div.hlist td {
234 padding-bottom: 5px;
235}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]236td.hlist1 {
237 vertical-align: top;
238 font-style: italic;
239 padding-right: 0.8em;
240}
241td.hlist2 {
242 vertical-align: top;
243}
244
245@media print {
246 div#footer-badges { display: none; }
247}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]248
249div#toctitle {
250 color: #527bbd;
251 font-family: sans-serif;
252 font-size: 1.1em;
253 font-weight: bold;
254 margin-top: 1.0em;
255 margin-bottom: 0.1em;
256}
257
258div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
259 margin-top: 0;
260 margin-bottom: 0;
261}
262div.toclevel2 {
263 margin-left: 2em;
264 font-size: 0.9em;
265}
266div.toclevel3 {
267 margin-left: 4em;
268 font-size: 0.9em;
269}
270div.toclevel4 {
271 margin-left: 6em;
272 font-size: 0.9em;
273}
274include1::./stylesheets/xhtml11-manpage.css[]
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]275/* Workarounds for IE6's broken and incomplete CSS2. */
276
277div.sidebar-content {
278 background: #ffffee;
279 border: 1px solid silver;
280 padding: 0.5em;
281}
282div.sidebar-title, div.image-title {
283 font-family: sans-serif;
284 font-weight: bold;
285 margin-top: 0.0em;
286 margin-bottom: 0.5em;
287}
288
289div.listingblock div.content {
290 border: 1px solid silver;
291 background: #f4f4f4;
292 padding: 0.5em;
293}
294
295div.quoteblock-content {
296 padding-left: 2.0em;
297}
298
299div.exampleblock-content {
300 border-left: 2px solid silver;
301 padding-left: 0.5em;
302}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]303
304/* IE6 sets dynamically generated links as visited. */
305div#toc a:visited { color: blue; }
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]306</style>
307<title>git-archimport(1)</title>
308</head>
309<body>
310<div id="header">
311<h1>
312git-archimport(1) Manual Page
313</h1>
314<h2>NAME</h2>
315<div class="sectionbody">
316<p>git-archimport -
317 Import an Arch repository into git
318</p>
319</div>
320</div>
321<h2>SYNOPSIS</h2>
322<div class="sectionbody">
Junio C Hamano235a91e2006-01-07 01:13:58[diff] [blame]323<div class="verseblock">
Junio C Hamanofce7c7e2008-07-02 03:06:38[diff] [blame]324<div class="content"><em>git archimport</em> [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir]
Junio C Hamanoabcd65d2007-03-08 02:43:00[diff] [blame]325 &lt;archive/branch&gt;[:&lt;git-branch&gt;] &#8230;</div></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]326</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]327<h2 id="_description">DESCRIPTION</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]328<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]329<div class="para"><p>Imports a project from one or more Arch repositories. It will follow branches
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]330and repositories within the namespaces defined by the &lt;archive/branch&gt;
Junio C Hamano235a91e2006-01-07 01:13:58[diff] [blame]331parameters supplied. If it cannot find the remote branch a merge comes from
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]332it will just import it as a regular commit. If it can find it, it will mark it
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]333as a merge whenever possible (see discussion below).</p></div>
334<div class="para"><p>The script expects you to provide the key roots where it can start the import
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]335from an <em>initial import</em> or <em>tag</em> type of Arch commit. It will follow and
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]336import new branches within the provided roots.</p></div>
337<div class="para"><p>It expects to be dealing with one project only. If it sees
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]338branches that have different roots, it will refuse to run. In that case,
339edit your &lt;archive/branch&gt; parameters to define clearly the scope of the
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]340import.</p></div>
341<div class="para"><p><em>git-archimport</em> uses <tt>tla</tt> extensively in the background to access the
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]342Arch repository.
343Make sure you have a recent version of <tt>tla</tt> available in the path. <tt>tla</tt> must
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]344know about the repositories you pass to <em>git-archimport</em>.</p></div>
345<div class="para"><p>For the initial import, <em>git-archimport</em> expects to find itself in an empty
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]346directory. To follow the development of a project that uses Arch, rerun
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]347<em>git-archimport</em> with the same parameters as the initial import to perform
348incremental imports.</p></div>
349<div class="para"><p>While <em>git-archimport</em> will try to create sensible branch names for the
Junio C Hamanoabcd65d2007-03-08 02:43:00[diff] [blame]350archives that it imports, it is also possible to specify git branch names
351manually. To do so, write a git branch name after each &lt;archive/branch&gt;
352parameter, separated by a colon. This way, you can shorten the Arch
353branch names and convert Arch jargon to git jargon, for example mapping a
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]354"PROJECT--devo--VERSION" branch to "master".</p></div>
355<div class="para"><p>Associating multiple Arch branches to one git branch is possible; the
Junio C Hamanoabcd65d2007-03-08 02:43:00[diff] [blame]356result will make the most sense only if no commits are made to the first
357branch, after the second branch is created. Still, this is useful to
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]358convert Arch repositories that had been rotated periodically.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]359</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]360<h2 id="_merges">MERGES</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]361<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]362<div class="para"><p>Patch merge data from Arch is used to mark merges in git as well. git
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]363does not care much about tracking patches, and only considers a merge when a
364branch incorporates all the commits since the point they forked. The end result
365is that git will have a good idea of how far branches have diverged. So the
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]366import process does lose some patch-trading metadata.</p></div>
367<div class="para"><p>Fortunately, when you try and merge branches imported from Arch,
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]368git will find a good merge base, and it has a good chance of identifying
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]369patches that have been traded out-of-sequence between the branches.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]370</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]371<h2 id="_options">OPTIONS</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]372<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]373<div class="vlist"><dl>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]374<dt>
375-h
376</dt>
377<dd>
378<p>
379 Display usage.
380</p>
381</dd>
382<dt>
383-v
384</dt>
385<dd>
386<p>
387 Verbose output.
388</p>
389</dd>
390<dt>
391-T
392</dt>
393<dd>
394<p>
395 Many tags. Will create a tag for every commit, reflecting the commit
396 name in the Arch repository.
397</p>
398</dd>
399<dt>
400-f
401</dt>
402<dd>
403<p>
404 Use the fast patchset import strategy. This can be significantly
405 faster for large trees, but cannot handle directory renames or
406 permissions changes. The default strategy is slow and safe.
407</p>
408</dd>
409<dt>
410-o
411</dt>
412<dd>
413<p>
414 Use this for compatibility with old-style branch names used by
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]415 earlier versions of <em>git-archimport</em>. Old-style branch names
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]416 were category--branch, whereas new-style branch names are
Junio C Hamanoabcd65d2007-03-08 02:43:00[diff] [blame]417 archive,category--branch--version. In both cases, names given
418 on the command-line will override the automatically-generated
419 ones.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]420</p>
421</dd>
422<dt>
423-D &lt;depth&gt;
424</dt>
425<dd>
426<p>
427 Follow merge ancestry and attempt to import trees that have been
428 merged from. Specify a depth greater than 1 if patch logs have been
429 pruned.
430</p>
431</dd>
432<dt>
433-a
434</dt>
435<dd>
436<p>
437 Attempt to auto-register archives at http://mirrors.sourcecontrol.net
438 This is particularly useful with the -D option.
439</p>
440</dd>
441<dt>
442-t &lt;tmpdir&gt;
443</dt>
444<dd>
445<p>
446 Override the default tempdir.
447</p>
448</dd>
449<dt>
450&lt;archive/branch&gt;
451</dt>
452<dd>
453<p>
454 Archive/branch identifier in a format that <tt>tla log</tt> understands.
455</p>
456</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]457</dl></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]458</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]459<h2 id="_author">Author</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]460<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]461<div class="para"><p>Written by Martin Langhoff &lt;martin@catalyst.net.nz&gt;.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]462</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]463<h2 id="_documentation">Documentation</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]464<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]465<div class="para"><p>Documentation by Junio C Hamano, Martin Langhoff and the git-list &lt;git@vger.kernel.org&gt;.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]466</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]467<h2 id="_git">GIT</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]468<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]469<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]470</div>
471<div id="footer">
472<div id="footer-text">
Junio C Hamano73d812c2009-07-01 02:33:06[diff] [blame]473Last updated 2009-07-01 02:30:42 UTC
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]474</div>
475</div>
476</body>
477</html>