This section has not been updated in a while and --branches/--tags/--trunk options are commonly used nowadays. Noticed-by: Lars Hjemli <hjemli@xxxxxxxxx> Signed-off-by: Eric Wong <normalperson@xxxxxxxx> --- Documentation/git-svn.txt | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) Eric Wong <normalperson@xxxxxxxx> wrote: > Lars Hjemli <hjemli@xxxxxxxxx> wrote: > > When updating git-svn.txt, I noticed that we might want to update the > > section "DESIGN PHILOSOPHY". Eric? > > Yeah. That's very much out of date. I'll update it in a bit. 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 ------- -- Eric Wong - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
