17
17
Imports a project from one or more Arch repositories. It will follow branches
18
18
and repositories within the namespaces defined by the <archive/branch>
19
19
parameters supplied. If it cannot find the remote branch a merge comes from
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).
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.
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
32
`git-archimport` uses `tla` extensively in the background to access the
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).
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.
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
32
`git-archimport` uses `tla` extensively in the background to access the
34
34
Make sure you have a recent version of `tla` available in the path. `tla` must
35
know about the repositories you pass to `git-archimport`.
35
know about the repositories you pass to `git-archimport`.
37
For the initial import `git-archimport` expects to find itself in an empty
38
directory. To follow the development of a project that uses Arch, rerun
39
`git-archimport` with the same parameters as the initial import to perform
37
For the initial import `git-archimport` expects to find itself in an empty
38
directory. To follow the development of a project that uses Arch, rerun
39
`git-archimport` with the same parameters as the initial import to perform
40
40
incremental imports.
42
42
While git-archimport will try to create sensible branch names for the
57
Patch merge data from Arch is used to mark merges in git as well. git
57
Patch merge data from Arch is used to mark merges in git as well. git
58
58
does not care much about tracking patches, and only considers a merge when a
59
59
branch incorporates all the commits since the point they forked. The end result
60
is that git will have a good idea of how far branches have diverged. So the
60
is that git will have a good idea of how far branches have diverged. So the
61
61
import process does lose some patch-trading metadata.
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.
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.
added
removed
Documentation/git-archimport.txt
