git-archimport.html

   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.2.5" />
   7 <style type="text/css">
   8 /* Debug borders */
   9 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
  10 /*
  11   border: 1px solid red;
  12 */
  13 }
  14
  15 body {
  16   margin: 1em 5% 1em 5%;
  17 }
  18
  19 a {
  20   color: blue;
  21   text-decoration: underline;
  22 }
  23 a:visited {
  24   color: fuchsia;
  25 }
  26
  27 em {
  28   font-style: italic;
  29 }
  30
  31 strong {
  32   font-weight: bold;
  33 }
  34
  35 tt {
  36   color: navy;
  37 }
  38
  39 h1, 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
  47 h1, h2, h3 {
  48   border-bottom: 2px solid silver;
  49 }
  50 h2 {
  51   padding-top: 0.5em;
  52 }
  53 h3 {
  54   float: left;
  55 }
  56 h3 + * {
  57   clear: left;
  58 }
  59
  60 div.sectionbody {
  61   font-family: serif;
  62   margin-left: 0;
  63 }
  64
  65 hr {
  66   border: 1px solid silver;
  67 }
  68
  69 p {
  70   margin-top: 0.5em;
  71   margin-bottom: 0.5em;
  72 }
  73
  74 pre {
  75   padding: 0;
  76   margin: 0;
  77 }
  78
  79 span#author {
  80   color: #527bbd;
  81   font-family: sans-serif;
  82   font-weight: bold;
  83   font-size: 1.1em;
  84 }
  85 span#email {
  86 }
  87 span#revision {
  88   font-family: sans-serif;
  89 }
  90
  91 div#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 }
  98 div#footer-text {
  99   float: left;
 100   padding-bottom: 0.5em;
 101 }
 102 div#footer-badges {
 103   float: right;
 104   padding-bottom: 0.5em;
 105 }
 106
 107 div#preamble,
 108 div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
 109 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
 110 div.admonitionblock {
 111   margin-right: 10%;
 112   margin-top: 1.5em;
 113   margin-bottom: 1.5em;
 114 }
 115 div.admonitionblock {
 116   margin-top: 2.5em;
 117   margin-bottom: 2.5em;
 118 }
 119
 120 div.content { /* Block element content. */
 121   padding: 0;
 122 }
 123
 124 /* Block element titles. */
 125 div.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 }
 132 div.title + * {
 133   margin-top: 0;
 134 }
 135
 136 td div.title:first-child {
 137   margin-top: 0.0em;
 138 }
 139 div.content div.title:first-child {
 140   margin-top: 0.0em;
 141 }
 142 div.content + div.title {
 143   margin-top: 0.0em;
 144 }
 145
 146 div.sidebarblock > div.content {
 147   background: #ffffee;
 148   border: 1px solid silver;
 149   padding: 0.5em;
 150 }
 151
 152 div.listingblock {
 153   margin-right: 0%;
 154 }
 155 div.listingblock > div.content {
 156   border: 1px solid silver;
 157   background: #f4f4f4;
 158   padding: 0.5em;
 159 }
 160
 161 div.quoteblock > div.content {
 162   padding-left: 2.0em;
 163 }
 164
 165 div.attribution {
 166   text-align: right;
 167 }
 168 div.verseblock + div.attribution {
 169   text-align: left;
 170 }
 171
 172 div.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 }
 180 div.admonitionblock td.content {
 181   padding-left: 0.5em;
 182   border-left: 2px solid silver;
 183 }
 184
 185 div.exampleblock > div.content {
 186   border-left: 2px solid silver;
 187   padding: 0.5em;
 188 }
 189
 190 div.verseblock div.content {
 191   white-space: pre;
 192 }
 193
 194 div.imageblock div.content { padding-left: 0; }
 195 div.imageblock img { border: 1px solid silver; }
 196 span.image img { border-style: none; }
 197
 198 dl {
 199   margin-top: 0.8em;
 200   margin-bottom: 0.8em;
 201 }
 202 dt {
 203   margin-top: 0.5em;
 204   margin-bottom: 0;
 205   font-style: italic;
 206 }
 207 dd > *:first-child {
 208   margin-top: 0;
 209 }
 210
 211 ul, ol {
 212     list-style-position: outside;
 213 }
 214 div.olist2 ol {
 215   list-style-type: lower-alpha;
 216 }
 217
 218 div.tableblock > table {
 219   border: 3px solid #527bbd;
 220 }
 221 thead {
 222   font-family: sans-serif;
 223   font-weight: bold;
 224 }
 225 tfoot {
 226   font-weight: bold;
 227 }
 228
 229 div.hlist {
 230   margin-top: 0.8em;
 231   margin-bottom: 0.8em;
 232 }
 233 div.hlist td {
 234   padding-bottom: 5px;
 235 }
 236 td.hlist1 {
 237   vertical-align: top;
 238   font-style: italic;
 239   padding-right: 0.8em;
 240 }
 241 td.hlist2 {
 242   vertical-align: top;
 243 }
 244
 245 @media print {
 246   div#footer-badges { display: none; }
 247 }
 248
 249 div#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
 258 div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
 259   margin-top: 0;
 260   margin-bottom: 0;
 261 }
 262 div.toclevel2 {
 263   margin-left: 2em;
 264   font-size: 0.9em;
 265 }
 266 div.toclevel3 {
 267   margin-left: 4em;
 268   font-size: 0.9em;
 269 }
 270 div.toclevel4 {
 271   margin-left: 6em;
 272   font-size: 0.9em;
 273 }
 274 include1::./stylesheets/xhtml11-manpage.css[]
 275 /* Workarounds for IE6's broken and incomplete CSS2. */
 276
 277 div.sidebar-content {
 278   background: #ffffee;
 279   border: 1px solid silver;
 280   padding: 0.5em;
 281 }
 282 div.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
 289 div.listingblock div.content {
 290   border: 1px solid silver;
 291   background: #f4f4f4;
 292   padding: 0.5em;
 293 }
 294
 295 div.quoteblock-content {
 296   padding-left: 2.0em;
 297 }
 298
 299 div.exampleblock-content {
 300   border-left: 2px solid silver;
 301   padding-left: 0.5em;
 302 }
 303
 304 /* IE6 sets dynamically generated links as visited. */
 305 div#toc a:visited { color: blue; }
 306 </style>
 307 <title>git-archimport(1)</title>
 308 </head>
 309 <body>
 310 <div id="header">
 311 <h1>
 312 git-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">
 323 <div class="verseblock">
 324 <div class="content"><em>git archimport</em> [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir]
 325                &lt;archive/branch&gt;[:&lt;git-branch&gt;] &#8230;</div></div>
 326 </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 &lt;archive/branch&gt;
 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 &lt;archive/branch&gt; parameters to define clearly the scope of the
 340 import.</p></div>
 341 <div class="para"><p><em>git archimport</em> uses <tt>tla</tt> extensively in the background to access the
 342 Arch repository.
 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 &lt;archive/branch&gt;
 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>
 359 </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>
 370 </div>
 371 <h2 id="_options">OPTIONS</h2>
 372 <div class="sectionbody">
 373 <div class="vlist"><dl>
 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
 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
 419         ones.
 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>
 457 </dl></div>
 458 </div>
 459 <h2 id="_author">Author</h2>
 460 <div class="sectionbody">
 461 <div class="para"><p>Written by Martin Langhoff &lt;martin@catalyst.net.nz&gt;.</p></div>
 462 </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 &lt;git@vger.kernel.org&gt;.</p></div>
 466 </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>
 470 </div>
 471 <div id="footer">
 472 <div id="footer-text">
 473 Last updated 2010-04-24 02:55:46 UTC
 474 </div>
 475 </div>
 476 </body>
 477 </html>