<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.1" />\r
+<meta name="generator" content="AsciiDoc 7.0.2" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git-svnimport</em> [ -o <branch-for-HEAD> ] [ -h ] [ -v ] [ -d | -D ]\r
- [ -C <GIT_repository> ] [ -i ] [ -u ] [-l limit_rev]\r
- [ -b branch_subdir ] [ -T trunk_subdir ] [ -t tag_subdir ]\r
- [ -s start_chg ] [ -m ] [ -M regex ]\r
- <SVN_repository_URL> [ <path> ]</p>\r
+<div class="verseblock">\r
+<div class="content"><em>git-svnimport</em> [ -o <branch-for-HEAD> ] [ -h ] [ -v ] [ -d | -D ]\r
+ [ -C <GIT_repository> ] [ -i ] [ -u ] [-l limit_rev]\r
+ [ -b branch_subdir ] [ -T trunk_subdir ] [ -t tag_subdir ]\r
+ [ -s start_chg ] [ -m ] [ -r ] [ -M regex ]\r
+ [ -I <ignorefile_name> ] [ -A <author_file> ]\r
+ <SVN_repository_URL> [ <path> ]</div></div>\r
</div>\r
<h2>DESCRIPTION</h2>\r
<div class="sectionbody">\r
<p>Imports a SVN repository into git. It will either create a new\r
repository, or incrementally import into an existing one.</p>\r
-<div class="hlist"><table>\r
-<tr>\r
-<td class="hlist1">\r
-SVN access is done by the SVN\r
-</td>\r
-<td class="hlist2">\r
-Perl module.\r
-</td>\r
-</tr>\r
-</table></div>\r
+<p>SVN access is done by the SVN::Perl module.</p>\r
<p>git-svnimport assumes that SVN repositories are organized into one\r
"trunk" directory where the main development happens, "branch/FOO"\r
directories for branches, and "/tags/FOO" directories for tags.\r
</p>\r
</dd>\r
<dt>\r
+-r\r
+</dt>\r
+<dd>\r
+<p>\r
+ Prepend <em>rX: </em> to commit messages, where X is the imported\r
+ subversion revision.\r
+</p>\r
+</dd>\r
+<dt>\r
+-I <ignorefile_name>\r
+</dt>\r
+<dd>\r
+<p>\r
+ Import the svn:ignore directory property to files with this\r
+ name in each directory. (The Subversion and GIT ignore\r
+ syntaxes are similar enough that using the Subversion patterns\r
+ directly with "-I .gitignore" will almost always just work.)\r
+</p>\r
+</dd>\r
+<dt>\r
+-A <author_file>\r
+</dt>\r
+<dd>\r
+<p>\r
+ Read a file with lines on the form\r
+</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt> username = User's Full Name <email@addr.es>\r
+</tt></pre>\r
+</div></div>\r
+<p>and use "User's Full Name <email@addr.es>" as the GIT\r
+author and committer for Subversion commits made by\r
+"username". If encountering a commit made by a user not in the\r
+list, abort.</p>\r
+<p>For convenience, this data is saved to $GIT_DIR/svn-authors\r
+each time the -A option is provided, and read from that same\r
+file each time git-svnimport is run with an existing GIT\r
+repository without -A.</p>\r
+</dd>\r
+<dt>\r
-m\r
</dt>\r
<dd>\r
</p>\r
<div class="literalblock">\r
<div class="content">\r
-<pre><tt>Formerly, this option controlled how many revisions to pull, due to\r
-SVN memory leaks. (These have been worked around.)</tt></pre>\r
+<pre><tt>Formerly, this option controlled how many revisions to pull,\r
+due to SVN memory leaks. (These have been worked around.)</tt></pre>\r
</div></div>\r
</dd>\r
<dt>\r
repository itself; it usually ends in "/svn".</p>\r
</dd>\r
<dt>\r
-<SVN_repository_URL>\r
+<path>\r
</dt>\r
<dd>\r
<p>\r
- The URL of the SVN module you want to import. For local\r
- repositories, use "file:///absolute/path".\r
+ The path to the module you want to check out.\r
</p>\r
</dd>\r
-</dl>\r
-<p><path>\r
- The path to the module you want to check out.</p>\r
-<dl>\r
<dt>\r
-h\r
</dt>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 06-Jan-2006 17:12:46 PDT\r
+Last updated 21-Mar-2006 08:33:43 UTC\r
</div>\r
</div>\r
</body>\r