Documentation/git-svn: updated design philosophy notes
This section has not been updated in a while and --branches/--tags/--trunk options are commonly used nowadays. Noticed-by: Lars Hjemli <hjemli@gmail.com> Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Eric Wong committed
Sep 18, 2007 at 16:50 UTC
bd43098c26cca4e831405d6114df5ad911550124
1 file changed
+6
-5
Documentation/git-svn.txt
+6
-5
@@ -478,11 +478,12 @@ previous commits in SVN.
478
DESIGN PHILOSOPHY
479
-----------------
480
Merge tracking in Subversion is lacking and doing branched development
481
-with Subversion is cumbersome as a result. git-svn does not do
482
-automated merge/branch tracking by default and leaves it entirely up to
483
-the user on the git side. git-svn does however follow copy
484
-history of the directory that it is tracking, however (much like
485
-how 'svn log' works).
481
+with Subversion can be cumbersome as a result. While git-svn can track
482
+copy history (including branches and tags) for repositories adopting a
483
+standard layout, it cannot yet represent merge history that happened
484
+inside git back upstream to SVN users. Therefore it is advised that
485
+users keep history as linear as possible inside git to ease
486
+compatibility with SVN (see the CAVEATS section below).
487
488
CAVEATS
489
-------