summaryrefslogtreecommitdiff
path: root/Documentation/git-svn.txt
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2007-09-18 23:50:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-09-19 00:07:45 (GMT)
commitbd43098c26cca4e831405d6114df5ad911550124 (patch)
treeea6972fe02e167a0fda48cb77be2f82cd153cdaf /Documentation/git-svn.txt
parentcd894ee9adf0c026b74761d7b1c0d8dabe4ff4e1 (diff)
downloadgit-bd43098c26cca4e831405d6114df5ad911550124.zip
git-bd43098c26cca4e831405d6114df5ad911550124.tar.gz
git-bd43098c26cca4e831405d6114df5ad911550124.tar.bz2
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>
Diffstat (limited to 'Documentation/git-svn.txt')
-rw-r--r--Documentation/git-svn.txt11
1 files changed, 6 insertions, 5 deletions
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index be2e34e..e157c6a 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -478,11 +478,12 @@ previous commits in SVN.
DESIGN PHILOSOPHY
-----------------
Merge tracking in Subversion is lacking and doing branched development
-with Subversion is cumbersome as a result. git-svn does not do
-automated merge/branch tracking by default and leaves it entirely up to
-the user on the git side. git-svn does however follow copy
-history of the directory that it is tracking, however (much like
-how 'svn log' works).
+with Subversion can be cumbersome as a result. While git-svn can track
+copy history (including branches and tags) for repositories adopting a
+standard layout, it cannot yet represent merge history that happened
+inside git back upstream to SVN users. Therefore it is advised that
+users keep history as linear as possible inside git to ease
+compatibility with SVN (see the CAVEATS section below).
CAVEATS
-------