Merge branch 'jc/maint-branch-mergeoptions'

[git.git] / contrib / svn-fe / svn-fe.txt

diff --git a/contrib/svn-fe/svn-fe.txt b/contrib/svn-fe/svn-fe.txt
index de30f83a1f94aa8dd2bf442e22634524e2689187..cd075b96c54419fdaa25c56b24133dd080f440ca 100644 (file)
--- a/contrib/svn-fe/svn-fe.txt
+++ b/contrib/svn-fe/svn-fe.txt
@@ -12,12 +12,15 @@ svnadmin dump --incremental REPO | svn-fe [url] | git fast-import
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------
 

-Converts a Subversion dumpfile (version: 2) into input suitable for
+Converts a Subversion dumpfile into input suitable for

 git-fast-import(1) and similar importers. REPO is a path to a
 Subversion repository mirrored on the local disk. Remote Subversion
 repositories can be mirrored on local disk using the `svnsync`
 command.
 
 git-fast-import(1) and similar importers. REPO is a path to a
 Subversion repository mirrored on the local disk. Remote Subversion
 repositories can be mirrored on local disk using the `svnsync`
 command.
 

+Note: this tool is very young.  The details of its commandline
+interface may change in backward incompatible ways.
+

 INPUT FORMAT
 ------------
 Subversion's repository dump format is documented in full in
 INPUT FORMAT
 ------------
 Subversion's repository dump format is documented in full in


@@ -25,6 +28,9 @@ Subversion's repository dump format is documented in full in
 Files in this format can be generated using the 'svnadmin dump' or
 'svk admin dump' command.
 
 Files in this format can be generated using the 'svnadmin dump' or
 'svk admin dump' command.
 

+Dumps produced with 'svnadmin dump --deltas' (dumpfile format v3)
+are not supported.
+

 OUTPUT FORMAT
 -------------
 The fast-import format is documented by the git-fast-import(1)
 OUTPUT FORMAT
 -------------
 The fast-import format is documented by the git-fast-import(1)


@@ -43,11 +49,9 @@ user <user@UUID>
 as committer, where 'user' is the value of the `svn:author` property
 and 'UUID' the repository's identifier.
 
 as committer, where 'user' is the value of the `svn:author` property
 and 'UUID' the repository's identifier.
 

-To support incremental imports, 'svn-fe' will put a `git-svn-id`
-line at the end of each commit log message if passed an url on the
-command line.  This line has the form `git-svn-id: URL@REVNO UUID`.
-
-Empty directories and unknown properties are silently discarded.
+To support incremental imports, 'svn-fe' puts a `git-svn-id` line at
+the end of each commit log message if passed an url on the command
+line.  This line has the form `git-svn-id: URL@REVNO UUID`.

 
 The resulting repository will generally require further processing
 to put each project in its own repository and to separate the history
 
 The resulting repository will generally require further processing
 to put each project in its own repository and to separate the history


@@ -56,9 +60,9 @@ may be useful for this purpose.
 
 BUGS
 ----
 
 BUGS
 ----

-Litters the current working directory with .bin files for
-persistence. Will be fixed when the svn-fe infrastructure is aware of
-a Git working directory.
+Empty directories and unknown properties are silently discarded.
+
+The exit status does not reflect whether an error was detected.

 
 SEE ALSO
 --------
 
 SEE ALSO
 --------