X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-archimport.txt;h=b6793cf55e56243e9ccfabe83161348bbab9dc1e;hb=230f13225df8b7e7eb0acc91a8c630f9e84967c1;hp=b1348351ef302db30339c8f38d175236e4e58242;hpb=a4c5f9aab740b6d3972c395d4b1af10c2026244b;p=git.git diff --git a/Documentation/git-archimport.txt b/Documentation/git-archimport.txt index b1348351..b6793cf5 100644 --- a/Documentation/git-archimport.txt +++ b/Documentation/git-archimport.txt @@ -3,7 +3,7 @@ git-archimport(1) NAME ---- -git-archimport - Import an arch repository into git +git-archimport - Import an Arch repository into GIT SYNOPSIS @@ -16,26 +16,30 @@ DESCRIPTION Imports a project from one or more Arch repositories. It will follow branches and repositories within the namespaces defined by the parameters suppplied. If it cannot find the remote branch a merge comes from -it will just import it as a regular merge. If it can find it, it will perform -a merge whenever possible. +it will just import it as a regular commit. If it can find it, it will mark it +as a merge whenever possible (see discussion below). The script expects you to provide the key roots where it can start the import -from an 'initial import' or 'tag' type of Arch commit. It will follow and import -new branches within the provided roots. +from an 'initial import' or 'tag' type of Arch commit. It will follow and +import new branches within the provided roots. It expects to be dealing with one project only. If it sees -branches that have different roots, it will refuse to run. In that case, edit your - parameters to define clearly the scope of the import. +branches that have different roots, it will refuse to run. In that case, +edit your parameters to define clearly the scope of the +import. -`git-archimport` uses `tla` extensively in the background to access the Arch repository. +`git-archimport` uses `tla` extensively in the background to access the +Arch repository. Make sure you have a recent version of `tla` available in the path. `tla` must know about the repositories you pass to `git-archimport`. For the initial import `git-archimport` expects to find itself in an empty directory. To follow the development of a project that uses Arch, rerun -`git-archimport` with the same parameters as the initial import to perform incremental imports. -of a project using Arch. +`git-archimport` with the same parameters as the initial import to perform +incremental imports. +MERGES +------ Patch merge data from Arch is used to mark merges in GIT as well. GIT does not care much about tracking patches, and only considers a merge when a branch incorporates all the commits since the point they forked. The end result @@ -77,5 +81,5 @@ Documentation by Junio C Hamano, Martin Langhoff and the git-list