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.4.5" />
7 <title>git-archimport(
1)
</title>
8 <style type=
"text/css">
10 p
, li
, dt
, dd
, div
, pre
, h1
, h2
, h3
, h4
, h5
, h6
{
12 border: 1px solid red;
17 margin: 1em 5% 1em 5%;
22 text-decoration: underline
;
42 h1
, h2
, h3
, h4
, h5
, h6
{
44 font-family: sans-serif
;
51 border-bottom: 2px solid silver
;
69 border: 1px solid silver
;
88 font-family: sans-serif
;
94 span#revnumber
, span#revdate
, span#revremark
{
95 font-family: sans-serif
;
99 font-family: sans-serif
;
101 border-top: 2px solid silver
;
107 padding-bottom: 0.5em;
111 padding-bottom: 0.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
{
122 margin-bottom: 1.5em;
124 div
.admonitionblock
{
126 margin-bottom: 2.5em;
129 div
.content
{ /* Block element content. */
133 /* Block element titles. */
134 div
.title
, caption
.title
{
136 font-family: sans-serif
;
140 margin-bottom: 0.5em;
146 td div
.title:first-child
{
149 div
.content div
.title:first-child
{
152 div
.content
+ div
.title
{
156 div
.sidebarblock
> div
.content
{
158 border: 1px solid silver
;
162 div
.listingblock
> div
.content
{
163 border: 1px solid silver
;
172 div
.quoteblock
> div
.attribution
{
181 div
.verseblock
> div
.content
{
184 div
.verseblock
> div
.attribution
{
188 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
189 div
.verseblock
+ div
.attribution
{
193 div
.admonitionblock
.icon
{
197 text-decoration: underline
;
199 padding-right: 0.5em;
201 div
.admonitionblock td
.content
{
203 border-left: 2px solid silver
;
206 div
.exampleblock
> div
.content
{
207 border-left: 2px solid silver
;
211 div
.imageblock div
.content
{ padding-left: 0; }
212 span
.image img
{ border-style: none
; }
213 a
.image:visited
{ color: white
; }
217 margin-bottom: 0.8em;
230 list-style-position: outside
;
233 list-style-type: decimal
;
236 list-style-type: lower-alpha
;
239 list-style-type: upper-alpha
;
242 list-style-type: lower-roman
;
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
{
252 margin-bottom: 0.1em;
255 div
.tableblock
> table
{
256 border: 3px solid
#527bbd;
259 font-family: sans-serif
;
271 /* Because the table frame attribute is overriden by CSS in most browsers. */
272 div
.tableblock
> table
[frame
="void"] {
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
;
287 margin-bottom: 0.8em;
290 padding-bottom: 15px;
292 dt
.hdlist1
.strong
, td
.hdlist1
.strong
{
298 padding-right: 0.8em;
304 div
.hdlist
.compact tr
{
314 div#footer-badges
{ display: none
; }
319 font-family: sans-serif
;
323 margin-bottom: 0.1em;
326 div
.toclevel1
, div
.toclevel2
, div
.toclevel3
, div
.toclevel4
{
342 /* Overrides for manpage documents */
345 padding-bottom: 0.5em;
346 border-top: 2px solid silver
;
347 border-bottom: 2px solid silver
;
357 div#toc
{ display: none
; }
360 /* Workarounds for IE6's broken and incomplete CSS2. */
362 div
.sidebar-content
{
364 border: 1px solid silver
;
367 div
.sidebar-title
, div
.image-title
{
369 font-family: sans-serif
;
372 margin-bottom: 0.5em;
375 div
.listingblock div
.content
{
376 border: 1px solid silver
;
381 div
.quoteblock-attribution
{
386 div
.verseblock-content
{
389 div
.verseblock-attribution
{
394 div
.exampleblock-content
{
395 border-left: 2px solid silver
;
399 /* IE6 sets dynamically generated links as visited. */
400 div#toc
a:visited
{ color: blue
; }
406 git-archimport(
1) Manual Page
409 <div class=
"sectionbody">
411 Import an Arch repository into git
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 <archive/branch
>[:
<git-branch
>]
…</div>
420 <div class=
"verseblock-attribution">
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
<archive/branch
>
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
<archive/branch
> parameters to define clearly the scope of the
437 <div class=
"paragraph"><p><em>git archimport
</em> uses
<tt>tla
</tt> extensively in the background to access the
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
<archive/branch
>
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--devo--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>
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>
467 <h2 id=
"_options">OPTIONS
</h2>
468 <div class=
"sectionbody">
469 <div class=
"dlist"><dl>
491 Many tags. Will create a tag for every commit, reflecting the commit
492 name in the Arch repository.
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.
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
--branch, whereas new-style branch names are
513 archive,category
--branch
--version. In both cases, names given
514 on the command-line will override the automatically-generated
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
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.
542 Override the default tempdir.
546 <archive/branch
>
550 Archive/branch identifier in a format that
<tt>tla log
</tt> understands.
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>
560 <div id=
"footer-text">
561 Last updated
2011-
03-
15 23:
30:
13 UTC