]>
Commit | Line | Data |
---|---|---|
215a7ad1 JH |
1 | git-archimport(1) |
2 | ================= | |
5077fa9c JH |
3 | |
4 | NAME | |
5 | ---- | |
72e9340c | 6 | git-archimport - Import an Arch repository into git |
5077fa9c JH |
7 | |
8 | ||
9 | SYNOPSIS | |
10 | -------- | |
353ce815 | 11 | [verse] |
b1889c36 | 12 | 'git archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir] |
d9cb5399 | 13 | <archive/branch>[:<git-branch>] ... |
5077fa9c JH |
14 | |
15 | DESCRIPTION | |
16 | ----------- | |
a4c5f9aa ML |
17 | Imports a project from one or more Arch repositories. It will follow branches |
18 | and repositories within the namespaces defined by the <archive/branch> | |
89438677 | 19 | parameters supplied. If it cannot find the remote branch a merge comes from |
a6080a0a JH |
20 | it will just import it as a regular commit. If it can find it, it will mark it |
21 | as a merge whenever possible (see discussion below). | |
5077fa9c | 22 | |
a6080a0a JH |
23 | The script expects you to provide the key roots where it can start the import |
24 | from an 'initial import' or 'tag' type of Arch commit. It will follow and | |
25 | import new branches within the provided roots. | |
5077fa9c | 26 | |
a6080a0a JH |
27 | It expects to be dealing with one project only. If it sees |
28 | branches that have different roots, it will refuse to run. In that case, | |
29 | edit your <archive/branch> parameters to define clearly the scope of the | |
30 | import. | |
a4c5f9aa | 31 | |
ba020ef5 | 32 | 'git-archimport' uses `tla` extensively in the background to access the |
f73ae1fc | 33 | Arch repository. |
a4c5f9aa | 34 | Make sure you have a recent version of `tla` available in the path. `tla` must |
ba020ef5 | 35 | know about the repositories you pass to 'git-archimport'. |
a4c5f9aa | 36 | |
ba020ef5 | 37 | For the initial import, 'git-archimport' expects to find itself in an empty |
a6080a0a | 38 | directory. To follow the development of a project that uses Arch, rerun |
ba020ef5 | 39 | 'git-archimport' with the same parameters as the initial import to perform |
f73ae1fc | 40 | incremental imports. |
a4c5f9aa | 41 | |
ba020ef5 | 42 | While 'git-archimport' will try to create sensible branch names for the |
d9cb5399 PB |
43 | archives that it imports, it is also possible to specify git branch names |
44 | manually. To do so, write a git branch name after each <archive/branch> | |
45 | parameter, separated by a colon. This way, you can shorten the Arch | |
46 | branch names and convert Arch jargon to git jargon, for example mapping a | |
47 | "PROJECT--devo--VERSION" branch to "master". | |
48 | ||
49 | Associating multiple Arch branches to one git branch is possible; the | |
50 | result will make the most sense only if no commits are made to the first | |
51 | branch, after the second branch is created. Still, this is useful to | |
52 | convert Arch repositories that had been rotated periodically. | |
53 | ||
54 | ||
a5c500b7 ML |
55 | MERGES |
56 | ------ | |
a6080a0a | 57 | Patch merge data from Arch is used to mark merges in git as well. git |
a4c5f9aa ML |
58 | does not care much about tracking patches, and only considers a merge when a |
59 | branch incorporates all the commits since the point they forked. The end result | |
a6080a0a | 60 | is that git will have a good idea of how far branches have diverged. So the |
a4c5f9aa ML |
61 | import process does lose some patch-trading metadata. |
62 | ||
a6080a0a JH |
63 | Fortunately, when you try and merge branches imported from Arch, |
64 | git will find a good merge base, and it has a good chance of identifying | |
65 | patches that have been traded out-of-sequence between the branches. | |
5077fa9c JH |
66 | |
67 | OPTIONS | |
68 | ------- | |
5077fa9c | 69 | |
a4c5f9aa ML |
70 | -h:: |
71 | Display usage. | |
72 | ||
73 | -v:: | |
a6080a0a | 74 | Verbose output. |
a4c5f9aa ML |
75 | |
76 | -T:: | |
a6080a0a | 77 | Many tags. Will create a tag for every commit, reflecting the commit |
a4c5f9aa ML |
78 | name in the Arch repository. |
79 | ||
42f4570c EW |
80 | -f:: |
81 | Use the fast patchset import strategy. This can be significantly | |
82 | faster for large trees, but cannot handle directory renames or | |
83 | permissions changes. The default strategy is slow and safe. | |
84 | ||
85 | -o:: | |
86 | Use this for compatibility with old-style branch names used by | |
ba020ef5 | 87 | earlier versions of 'git-archimport'. Old-style branch names |
42f4570c | 88 | were category--branch, whereas new-style branch names are |
d9cb5399 PB |
89 | archive,category--branch--version. In both cases, names given |
90 | on the command-line will override the automatically-generated | |
91 | ones. | |
42f4570c EW |
92 | |
93 | -D <depth>:: | |
94 | Follow merge ancestry and attempt to import trees that have been | |
95 | merged from. Specify a depth greater than 1 if patch logs have been | |
96 | pruned. | |
97 | ||
98 | -a:: | |
99 | Attempt to auto-register archives at http://mirrors.sourcecontrol.net | |
100 | This is particularly useful with the -D option. | |
101 | ||
a4c5f9aa ML |
102 | -t <tmpdir>:: |
103 | Override the default tempdir. | |
104 | ||
105 | ||
106 | <archive/branch>:: | |
a6080a0a | 107 | Archive/branch identifier in a format that `tla log` understands. |
5077fa9c JH |
108 | |
109 | ||
110 | Author | |
111 | ------ | |
112 | Written by Martin Langhoff <martin@catalyst.net.nz>. | |
113 | ||
114 | Documentation | |
115 | -------------- | |
a4c5f9aa | 116 | Documentation by Junio C Hamano, Martin Langhoff and the git-list <git@vger.kernel.org>. |
5077fa9c JH |
117 | |
118 | GIT | |
119 | --- | |
9e1f0a85 | 120 | Part of the linkgit:git[1] suite |