{"thread":{"id":"9933","subject":"[PATCH] Documentation/git-svn: updated design philosophy notes","startedAt":"2007-09-18T23:50:42Z","lastAt":"2007-09-18T23:50:42Z","messageCount":1,"participants":["Eric Wong"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"53531","messageId":"20070918235042.GA11992@untitled","threadId":"9933","inReplyTo":null,"subject":"[PATCH] Documentation/git-svn: updated design philosophy notes","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2007-09-18T23:50:42Z","receivedAt":"2007-09-18T23:50:42Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"This section has not been updated in a while and\n--branches/--tags/--trunk options are commonly used nowadays.\n\nNoticed-by: Lars Hjemli <hjemli@gmail.com>\nSigned-off-by: Eric Wong <normalperson@yhbt.net>\n---\n Documentation/git-svn.txt |   11 ++++++-----\n 1 files changed, 6 insertions(+), 5 deletions(-)\n\n  Eric Wong <normalperson@yhbt.net> wrote:\n  > Lars Hjemli <hjemli@gmail.com> wrote:\n  > > When updating git-svn.txt, I noticed that we might want to update the\n  > > section \"DESIGN PHILOSOPHY\". Eric?\n  > \n  > Yeah.  That's very much out of date.  I'll update it in a bit.\n\ndiff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt\nindex be2e34e..e157c6a 100644\n--- a/Documentation/git-svn.txt\n+++ b/Documentation/git-svn.txt\n@@ -478,11 +478,12 @@ previous commits in SVN.\n DESIGN PHILOSOPHY\n -----------------\n Merge tracking in Subversion is lacking and doing branched development\n-with Subversion is cumbersome as a result.  git-svn does not do\n-automated merge/branch tracking by default and leaves it entirely up to\n-the user on the git side.  git-svn does however follow copy\n-history of the directory that it is tracking, however (much like\n-how 'svn log' works).\n+with Subversion can be cumbersome as a result.  While git-svn can track\n+copy history (including branches and tags) for repositories adopting a\n+standard layout, it cannot yet represent merge history that happened\n+inside git back upstream to SVN users.  Therefore it is advised that\n+users keep history as linear as possible inside git to ease\n+compatibility with SVN (see the CAVEATS section below).\n \n CAVEATS\n -------\n-- \nEric Wong\n"}]}