{"thread":{"id":"1768","subject":"archimport documentation updates and tidyups","startedAt":"2005-09-11T09:26:05Z","lastAt":"2005-09-11T14:58:21Z","messageCount":3,"participants":["martin@catalyst.net.nz","A Large Angry SCM"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"8277","messageId":"1126430765449-git-send-email-martin@catalyst.net.nz","threadId":"1768","inReplyTo":null,"subject":"archimport documentation updates and tidyups","fromName":"","fromEmail":"martin@catalyst.net.nz","sentAt":"2005-09-11T09:26:05Z","receivedAt":"2005-09-11T09:26:05Z","isPatch":false,"sender":{"key":"martin@laptop.org","avatar":null},"body":"This patch series covers the Documentation for the archimport \nscript, plus the remaining TODOs that I consider important.\n\nWith these patches I consider archimport done, modulo bugs and \ninteresting user requests.\n\n [PATCH 1/5] archimport documentation update\n [PATCH 2/5] archimport documentation tidyup\n [PATCH 3/5] archimport - update in-script doco, options tidyup\n [PATCH 4/5] archimport - use GIT_DIR instead of hardcoded \".git\"\n [PATCH 5/5] archimport - better handling of temp dirs\n"},{"id":"8279","messageId":"11264307651299-git-send-email-martin@catalyst.net.nz","threadId":"1768","inReplyTo":"1126430765449-git-send-email-martin@catalyst.net.nz","subject":"[PATCH 1/5] archimport documentation update","fromName":"","fromEmail":"martin@catalyst.net.nz","sentAt":"2005-09-11T09:26:05Z","receivedAt":"2005-09-11T09:26:05Z","isPatch":true,"sender":{"key":"martin@laptop.org","avatar":null},"body":"Updated and expanded the command description, and added a reference of the\ncommand line options.\n\nSigned-off-by: Martin Langhoff \n\n\n---\n\n Documentation/git-archimport.txt | 63 +++++++++++++++++++++++++++++++-------\n 1 files changed, 51 insertions(+), 12 deletions(-)\n\nb3ee96f94c9ec4378d18a13074d1bbeebb0858b5\ndiff --git a/Documentation/git-archimport.txt b/Documentation/git-archimport.txt\n--- a/Documentation/git-archimport.txt\n+++ b/Documentation/git-archimport.txt\n@@ -8,24 +8,63 @@ git-archimport - Import an arch reposito\n \n SYNOPSIS\n --------\n-`git-archimport` [--option...] \n+`git-archimport` [ -h ] [ -v ] [ -T ] [ -t tempdir ] \n+ [ ]\n \n DESCRIPTION\n -----------\n-The script expects you to provide the key roots where it can start the\n-import from an 'initial import' or 'tag' type of Arch commit. It will\n-then follow all the branching and tagging within the provided roots.\n-\n-It will die if it sees branches that have different roots.\n-\n+Imports a project from one or more Arch repositories. It will follow branches\n+and repositories within the namespaces defined by the \n+parameters suppplied. If it cannot find the remote branch a merge comes from\n+it will just import it as a regular merge. If it can find it, it will perform\n+a merge whenever possible. \n+\n+The script expects you to provide the key roots where it can start the import \n+from an 'initial import' or 'tag' type of Arch commit. It will follow and import \n+new branches within the provided roots. \n+\n+It expects to be dealing with one project only. If it sees \n+branches that have different roots, it will refuse to run. In that case, edit your\n+ parameters to define clearly the scope of the import. \n+\n+`git-archimport` uses `tla` extensively in the background to access the Arch repository.\n+Make sure you have a recent version of `tla` available in the path. `tla` must\n+know about the repositories you pass to `git-archimport`. \n+\n+For the initial import `git-archimport` expects to find itself in an empty \n+directory. To follow the development of a project that uses Arch, rerun \n+`git-archimport` with the same parameters as the initial import to perform incremental imports.\n+of a project using Arch.\n+\n+Patch merge data from Arch is used to mark merges in GIT as well. GIT \n+does not care much about tracking patches, and only considers a merge when a\n+branch incorporates all the commits since the point they forked. The end result\n+is that GIT will have a good idea of how far branches have diverged. So the \n+import process does lose some patch-trading metadata.\n+\n+Fortunately, when you try and merge branches imported from Arch, \n+GIT will find a good merge base, and it has a good chance of identifying \n+patches that have been traded out-of-sequence between the branches. \n \n OPTIONS\n -------\n---option::\n-\tSome option not yet documented.\n \n-...::\n-\tSome argument not yet documented.\n+-h::\n+\tDisplay usage.\n+\n+-v::\n+\tVerbose output. \n+\n+-T::\n+\tMany tags. Will create a tag for every commit, reflecting the commit \n+\tname in the Arch repository.\n+\n+-t ::\n+\tOverride the default tempdir.\n+\n+\n+::\n+\tArchive/branch identifier in a format that `tla log` understands. \n \n \n Author\n@@ -34,7 +73,7 @@ Written by Martin Langhoff .\n+Documentation by Junio C Hamano, Martin Langhoff and the git-list .\n \n GIT\n ---\n"},{"id":"8291","messageId":"4324460D.6010103@gmail.com","threadId":"1768","inReplyTo":"11264307651299-git-send-email-martin@catalyst.net.nz","subject":"Re: [PATCH 1/5] archimport documentation update","fromName":"A Large Angry SCM","fromEmail":"gitzilla@gmail.com","sentAt":"2005-09-11T14:58:21Z","receivedAt":"2005-09-11T14:58:21Z","isPatch":true,"sender":{"key":"gitzilla@gmail.com","avatar":"https://gravatar.com/avatar/354625c442439908ff3dd99757dee330e29e9df7847472384faf7a00add247fb?d=mp&s=160"},"body":"martin@catalyst.net.nz wrote:\n> Updated and expanded the command description, and added a reference of the\n> command line options.\n> \n> Signed-off-by: Martin Langhoff \n> \n[...]\n\nThanks Martin!\n"}]}