1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
\r
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
\r
3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
\r
5 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
\r
6 <meta name="generator" content="AsciiDoc 7.0.1" />
\r
7 <style type="text/css">
\r
9 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
\r
11 border: 1px solid red;
\r
16 margin: 1em 5% 1em 5%;
\r
20 a:visited { color: fuchsia; }
\r
34 h1, h2, h3, h4, h5, h6 {
\r
36 font-family: sans-serif;
\r
38 margin-bottom: 0.5em;
\r
43 border-bottom: 2px solid silver;
\r
46 border-bottom: 2px solid silver;
\r
56 border: 1px solid silver;
\r
61 margin-bottom: 0.5em;
\r
71 font-family: sans-serif;
\r
78 font-family: sans-serif;
\r
82 font-family: sans-serif;
\r
84 border-top: 2px solid silver;
\r
90 padding-bottom: 0.5em;
\r
94 padding-bottom: 0.5em;
\r
98 div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
\r
99 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
\r
100 div.admonitionblock {
\r
103 margin-bottom: 1.5em;
\r
105 div.admonitionblock {
\r
107 margin-bottom: 2.5em;
\r
110 div.content { /* Block element content. */
\r
114 /* Block element titles. */
\r
115 div.title, caption.title {
\r
116 font-family: sans-serif;
\r
120 margin-bottom: 0.5em;
\r
126 td div.title:first-child {
\r
129 div.content div.title:first-child {
\r
132 div.content + div.title {
\r
136 div.sidebarblock > div.content {
\r
137 background: #ffffee;
\r
138 border: 1px solid silver;
\r
142 div.listingblock > div.content {
\r
143 border: 1px solid silver;
\r
144 background: #f4f4f4;
\r
148 div.quoteblock > div.content {
\r
149 padding-left: 2.0em;
\r
151 div.quoteblock .attribution {
\r
155 div.admonitionblock .icon {
\r
156 vertical-align: top;
\r
159 text-decoration: underline;
\r
161 padding-right: 0.5em;
\r
163 div.admonitionblock td.content {
\r
164 padding-left: 0.5em;
\r
165 border-left: 2px solid silver;
\r
168 div.exampleblock > div.content {
\r
169 border-left: 2px solid silver;
\r
173 div.verseblock div.content {
\r
177 div.imageblock div.content { padding-left: 0; }
\r
178 div.imageblock img { border: 1px solid silver; }
\r
179 span.image img { border-style: none; }
\r
183 margin-bottom: 0.8em;
\r
188 font-style: italic;
\r
190 dd > *:first-child {
\r
195 list-style-position: outside;
\r
198 list-style-type: lower-alpha;
\r
201 div.tableblock > table {
\r
202 border-color: #527bbd;
\r
206 font-family: sans-serif;
\r
215 margin-bottom: 0.8em;
\r
218 vertical-align: top;
\r
219 font-style: italic;
\r
220 padding-right: 0.8em;
\r
223 vertical-align: top;
\r
227 div#footer-badges { display: none; }
\r
229 include::./stylesheets/xhtml11-manpage.css[]
\r
230 /* Workarounds for IE6's broken and incomplete CSS2. */
\r
232 div.sidebar-content {
\r
233 background: #ffffee;
\r
234 border: 1px solid silver;
\r
237 div.sidebar-title, div.image-title {
\r
238 font-family: sans-serif;
\r
241 margin-bottom: 0.5em;
\r
244 div.listingblock div.content {
\r
245 border: 1px solid silver;
\r
246 background: #f4f4f4;
\r
250 div.quoteblock-content {
\r
251 padding-left: 2.0em;
\r
254 div.exampleblock-content {
\r
255 border-left: 2px solid silver;
\r
256 padding-left: 0.5em;
\r
259 <title>git-archimport(1)</title>
\r
264 git-archimport(1) Manual Page
\r
267 <div class="sectionbody">
\r
268 <p>git-archimport -
\r
269 Import an Arch repository into git
\r
274 <div class="sectionbody">
\r
275 <div class="verseblock">
\r
276 <div class="content"><tt>git-archimport</tt> [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir]
\r
277 <archive/branch> [ <archive/branch> ]</div></div>
\r
279 <h2>DESCRIPTION</h2>
\r
280 <div class="sectionbody">
\r
281 <p>Imports a project from one or more Arch repositories. It will follow branches
\r
282 and repositories within the namespaces defined by the <archive/branch>
\r
283 parameters supplied. If it cannot find the remote branch a merge comes from
\r
284 it will just import it as a regular commit. If it can find it, it will mark it
\r
285 as a merge whenever possible (see discussion below).</p>
\r
286 <p>The script expects you to provide the key roots where it can start the import
\r
287 from an <em>initial import</em> or <em>tag</em> type of Arch commit. It will follow and
\r
288 import new branches within the provided roots.</p>
\r
289 <p>It expects to be dealing with one project only. If it sees
\r
290 branches that have different roots, it will refuse to run. In that case,
\r
291 edit your <archive/branch> parameters to define clearly the scope of the
\r
293 <p><tt>git-archimport</tt> uses <tt>tla</tt> extensively in the background to access the
\r
295 Make sure you have a recent version of <tt>tla</tt> available in the path. <tt>tla</tt> must
\r
296 know about the repositories you pass to <tt>git-archimport</tt>.</p>
\r
297 <p>For the initial import <tt>git-archimport</tt> expects to find itself in an empty
\r
298 directory. To follow the development of a project that uses Arch, rerun
\r
299 <tt>git-archimport</tt> with the same parameters as the initial import to perform
\r
300 incremental imports.</p>
\r
303 <div class="sectionbody">
\r
304 <p>Patch merge data from Arch is used to mark merges in git as well. git
\r
305 does not care much about tracking patches, and only considers a merge when a
\r
306 branch incorporates all the commits since the point they forked. The end result
\r
307 is that git will have a good idea of how far branches have diverged. So the
\r
308 import process does lose some patch-trading metadata.</p>
\r
309 <p>Fortunately, when you try and merge branches imported from Arch,
\r
310 git will find a good merge base, and it has a good chance of identifying
\r
311 patches that have been traded out-of-sequence between the branches.</p>
\r
314 <div class="sectionbody">
\r
337 Many tags. Will create a tag for every commit, reflecting the commit
\r
338 name in the Arch repository.
\r
346 Use the fast patchset import strategy. This can be significantly
\r
347 faster for large trees, but cannot handle directory renames or
\r
348 permissions changes. The default strategy is slow and safe.
\r
356 Use this for compatibility with old-style branch names used by
\r
357 earlier versions of git-archimport. Old-style branch names
\r
358 were category--branch, whereas new-style branch names are
\r
359 archive,category--branch--version.
\r
367 Follow merge ancestry and attempt to import trees that have been
\r
368 merged from. Specify a depth greater than 1 if patch logs have been
\r
377 Attempt to auto-register archives at http://mirrors.sourcecontrol.net
\r
378 This is particularly useful with the -D option.
\r
386 Override the default tempdir.
\r
390 <archive/branch>
\r
394 Archive/branch identifier in a format that <tt>tla log</tt> understands.
\r
400 <div class="sectionbody">
\r
401 <p>Written by Martin Langhoff <martin@catalyst.net.nz>.</p>
\r
403 <h2>Documentation</h2>
\r
404 <div class="sectionbody">
\r
405 <p>Documentation by Junio C Hamano, Martin Langhoff and the git-list <git@vger.kernel.org>.</p>
\r
408 <div class="sectionbody">
\r
409 <p>Part of the <a href="git.html">git(7)</a> suite</p>
\r
412 <div id="footer-text">
\r
413 Last updated 06-Jan-2006 17:12:04 PDT
\r