diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-09-19 02:27:57 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-09-19 02:27:57 +0000 |
| commit | d2d9ae15e2c76f17c5870205b390354b509d0d97 (patch) | |
| tree | fa56fc67d1c01ad2aaa6503faef16dbe09279d04 /git-svn.txt | |
| parent | 597ffcfc47c6c902cbb16c43ad95917ea51f0634 (diff) | |
| download | git-htmldocs-d2d9ae15e2c76f17c5870205b390354b509d0d97.tar.gz | |
Autogenerated HTML docs for v1.5.3.1-153-g89df5
Diffstat (limited to 'git-svn.txt')
| -rw-r--r-- | git-svn.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/git-svn.txt b/git-svn.txt index be2e34eb8..e157c6ab5 100644 --- a/git-svn.txt +++ b/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 ------- |