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">
5 <meta http-equiv=
"Content-Type" content=
"text/html; charset=UTF-8" />
6 <meta name=
"generator" content=
"AsciiDoc 8.2.5" />
7 <style type=
"text/css">
9 p
, li
, dt
, dd
, div
, pre
, h1
, h2
, h3
, h4
, h5
, h6
{
11 border: 1px solid red;
16 margin: 1em 5% 1em 5%;
21 text-decoration: underline
;
39 h1
, h2
, h3
, h4
, h5
, h6
{
41 font-family: sans-serif
;
48 border-bottom: 2px solid silver
;
66 border: 1px solid silver
;
81 font-family: sans-serif
;
88 font-family: sans-serif
;
92 font-family: sans-serif
;
94 border-top: 2px solid silver
;
100 padding-bottom: 0.5em;
104 padding-bottom: 0.5em;
108 div
.tableblock
, div
.imageblock
, div
.exampleblock
, div
.verseblock
,
109 div
.quoteblock
, div
.literalblock
, div
.listingblock
, div
.sidebarblock
,
110 div
.admonitionblock
{
113 margin-bottom: 1.5em;
115 div
.admonitionblock
{
117 margin-bottom: 2.5em;
120 div
.content
{ /* Block element content. */
124 /* Block element titles. */
125 div
.title
, caption
.title
{
126 font-family: sans-serif
;
130 margin-bottom: 0.5em;
136 td div
.title:first-child
{
139 div
.content div
.title:first-child
{
142 div
.content
+ div
.title
{
146 div
.sidebarblock
> div
.content
{
148 border: 1px solid silver
;
155 div
.listingblock
> div
.content
{
156 border: 1px solid silver
;
161 div
.quoteblock
> div
.content
{
168 div
.verseblock
+ div
.attribution
{
172 div
.admonitionblock
.icon
{
176 text-decoration: underline
;
178 padding-right: 0.5em;
180 div
.admonitionblock td
.content
{
182 border-left: 2px solid silver
;
185 div
.exampleblock
> div
.content
{
186 border-left: 2px solid silver
;
190 div
.verseblock div
.content
{
194 div
.imageblock div
.content
{ padding-left: 0; }
195 div
.imageblock img
{ border: 1px solid silver
; }
196 span
.image img
{ border-style: none
; }
200 margin-bottom: 0.8em;
212 list-style-position: outside
;
215 list-style-type: lower-alpha
;
218 div
.tableblock
> table
{
219 border: 3px solid
#527bbd;
222 font-family: sans-serif
;
231 margin-bottom: 0.8em;
239 padding-right: 0.8em;
246 div#footer-badges
{ display: none
; }
251 font-family: sans-serif
;
255 margin-bottom: 0.1em;
258 div
.toclevel1
, div
.toclevel2
, div
.toclevel3
, div
.toclevel4
{
274 include1::./stylesheets
/xhtml11-manpage
.css
[]
275 /* Workarounds for IE6's broken and incomplete CSS2. */
277 div
.sidebar-content
{
279 border: 1px solid silver
;
282 div
.sidebar-title
, div
.image-title
{
283 font-family: sans-serif
;
286 margin-bottom: 0.5em;
289 div
.listingblock div
.content
{
290 border: 1px solid silver
;
295 div
.quoteblock-content
{
299 div
.exampleblock-content
{
300 border-left: 2px solid silver
;
304 /* IE6 sets dynamically generated links as visited. */
305 div#toc
a:visited
{ color: blue
; }
307 <title>git-archimport(
1)
</title>
312 git-archimport(
1) Manual Page
315 <div class=
"sectionbody">
317 Import an Arch repository into git
322 <div class=
"sectionbody">
323 <div class=
"verseblock">
324 <div class=
"content"><em>git archimport
</em> [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir]
325 <archive/branch
>[:
<git-branch
>]
…</div></div>
327 <h2 id=
"_description">DESCRIPTION
</h2>
328 <div class=
"sectionbody">
329 <div class=
"para"><p>Imports a project from one or more Arch repositories. It will follow branches
330 and repositories within the namespaces defined by the
<archive/branch
>
331 parameters supplied. If it cannot find the remote branch a merge comes from
332 it will just import it as a regular commit. If it can find it, it will mark it
333 as 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
335 from an
<em>initial import
</em> or
<em>tag
</em> type of Arch commit. It will follow and
336 import 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
338 branches that have different roots, it will refuse to run. In that case,
339 edit your
<archive/branch
> parameters to define clearly the scope of the
341 <div class=
"para"><p><em>git archimport
</em> uses
<tt>tla
</tt> extensively in the background to access the
343 Make sure you have a recent version of
<tt>tla
</tt> available in the path.
<tt>tla
</tt> must
344 know 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
346 directory. To follow the development of a project that uses Arch, rerun
347 <em>git archimport
</em> with the same parameters as the initial import to perform
348 incremental imports.
</p></div>
349 <div class=
"para"><p>While
<em>git archimport
</em> will try to create sensible branch names for the
350 archives that it imports, it is also possible to specify git branch names
351 manually. To do so, write a git branch name after each
<archive/branch
>
352 parameter, separated by a colon. This way, you can shorten the Arch
353 branch names and convert Arch jargon to git jargon, for example mapping a
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
356 result will make the most sense only if no commits are made to the first
357 branch, after the second branch is created. Still, this is useful to
358 convert Arch repositories that had been rotated periodically.
</p></div>
360 <h2 id=
"_merges">MERGES
</h2>
361 <div class=
"sectionbody">
362 <div class=
"para"><p>Patch merge data from Arch is used to mark merges in git as well. git
363 does not care much about tracking patches, and only considers a merge when a
364 branch incorporates all the commits since the point they forked. The end result
365 is that git will have a good idea of how far branches have diverged. So the
366 import process does lose some patch-trading metadata.
</p></div>
367 <div class=
"para"><p>Fortunately, when you try and merge branches imported from Arch,
368 git will find a good merge base, and it has a good chance of identifying
369 patches that have been traded out-of-sequence between the branches.
</p></div>
371 <h2 id=
"_options">OPTIONS
</h2>
372 <div class=
"sectionbody">
373 <div class=
"vlist"><dl>
395 Many tags. Will create a tag for every commit, reflecting the commit
396 name in the Arch repository.
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.
414 Use this for compatibility with old-style branch names used by
415 earlier versions of
<em>git archimport
</em>. Old-style branch names
416 were category--branch, whereas new-style branch names are
417 archive,category--branch--version. In both cases, names given
418 on the command-line will override the automatically-generated
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
437 Attempt to auto-register archives at http://mirrors.sourcecontrol.net
438 This is particularly useful with the -D option.
446 Override the default tempdir.
450 <archive/branch
>
454 Archive/branch identifier in a format that
<tt>tla log
</tt> understands.
459 <h2 id=
"_author">Author
</h2>
460 <div class=
"sectionbody">
461 <div class=
"para"><p>Written by Martin Langhoff
<martin@catalyst.net.nz
>.
</p></div>
463 <h2 id=
"_documentation">Documentation
</h2>
464 <div class=
"sectionbody">
465 <div class=
"para"><p>Documentation by Junio C Hamano, Martin Langhoff and the git-list
<git@vger.kernel.org
>.
</p></div>
467 <h2 id=
"_git">GIT
</h2>
468 <div class=
"sectionbody">
469 <div class=
"para"><p>Part of the
<a href=
"git.html">git(
1)
</a> suite
</p></div>
472 <div id=
"footer-text">
473 Last updated
2010-
04-
24 02:
55:
46 UTC