diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-09-18 17:39:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-18 17:39:25 -0700 |
| commit | 89df580d0a2e97b0c7c072d87e5e815534deed56 (patch) | |
| tree | a83d7ebc208890d26cb9343a361b8e671d471bde /Documentation/git-svn.txt | |
| parent | d28840461d9cebd79f1ec30a4117661b41e2c9a3 (diff) | |
| parent | 8ae674952c8f301034e8ae9dceff38dda740623b (diff) | |
| download | git-89df580d0a2e97b0c7c072d87e5e815534deed56.tar.gz | |
Merge branch 'maint'
* maint:
Fixed update-hook example allow-users format.
Documentation/git-svn: updated design philosophy notes
t/t4014: test "am -3" with mode-only change.
Fix lapsus in builtin-apply.c
git-push: documentation and tests for pushing only branches
git-svnimport: Use separate arguments in the pipe for git-rev-parse
Diffstat (limited to 'Documentation/git-svn.txt')
| -rw-r--r-- | Documentation/git-svn.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index be2e34eb8f..e157c6ab50 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 ------- |