On Sat, Oct 5, 2013 at 7:30 PM, Johan Herland <johan@xxxxxxxxxxx> wrote: > diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt > index 4dd3bcb..da00671 100644 > --- a/Documentation/git-svn.txt > +++ b/Documentation/git-svn.txt > @@ -973,6 +979,15 @@ without giving any repository layout options. If the full history with > branches and tags is required, the options '--trunk' / '--branches' / > '--tags' must be used. > > +When using the options for describing the repository layout (--trunk, > +--tags, --branches, --stdlayout), please also specify the --prefix > +option (e.g. '--prefix=origin/') to cause your SVN-tracking refs to be > +placed at refs/remotes/origin/* rather than the default refs/remotes/*. > +The former is more compatible with the layout of Git's "regular" > +remote-tracking refs (refs/remotes/$remote/*), and may potentially > +prevent similarly named SVN branches and Git remotes from clobbering > +eachother. s/eachother/each other/ > When using multiple --branches or --tags, 'git svn' does not automatically > handle name collisions (for example, if two branches from different paths have > the same name, or if a branch and a tag have the same name). In these cases, > @@ -1035,8 +1050,8 @@ comma-separated list of names within braces. For example: > [svn-remote "huge-project"] > url = http://server.org/svn > fetch = trunk/src:refs/remotes/trunk > - branches = branches/{red,green}/src:refs/remotes/branches/* > - tags = tags/{1.0,2.0}/src:refs/remotes/tags/* > + branches = branches/{red,green}/src:refs/remotes/project-a/branches/* > + tags = tags/{1.0,2.0}/src:refs/remotes/project-a/tags/* > ------------------------------------------------------------------------ > > Multiple fetch, branches, and tags keys are supported: > -- -- 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