llvm dev - Feb 2011 - [LLVMdev] [cfe-dev] Reminder: LLVM 2.9 Branching in One Week

On Feb 28, 2011, at 10:01 AM, David A. Greene wrote:
> Chad Colgur <colgur at gmail.com> writes:
> 
>> Will the 2.9 branch be reflected in the git mirrors?
> 
> I really, really hope this is the case.  The official git mirror
> documentation says it is only trunk because the current branching scheme
> in not suitable for git.  I don't understand why that would be but
I'm
> not a git-svn expert.
It doesn't work because git-svn assumes that all of your branches begin at
the same position in the SVN tree, i.e. llvm/branches/*.  The problem is that we
have some branches in llvm/branches/*, some in llvm/branches/Apple/*, some in
llvm/branches/ggrief/*, etc.  The end result is that git-svn gets horribly
confused.

--Owen

Owen Anderson <resistor at mac.com> writes:
> It doesn't work because git-svn assumes that all of your branches
> begin at the same position in the SVN tree, i.e. llvm/branches/*.  The
> problem is that we have some branches in llvm/branches/*, some in
> llvm/branches/Apple/*, some in llvm/branches/ggrief/*, etc.  The end
> result is that git-svn gets horribly confused.
But all of the public-facing branches (I think RELEASE_* are the only
branches most people care about) are in llvm/tags/* (or will be in
llvm/tags/RELEASE_29/* for 2.9), right?

So I guess it will be a problem if 3.0 is in llvm/tags/RELEASE_30/*.
This is perhaps one reason not to use the branching scheme Bill
proposed.  That's not a very satisfactory result.

                               -Dave

Owen Anderson <resistor at mac.com> writes:
> It doesn't work because git-svn assumes that all of your branches
> begin at the same position in the SVN tree, i.e. llvm/branches/*.  The
> problem is that we have some branches in llvm/branches/*, some in
> llvm/branches/Apple/*, some in llvm/branches/ggrief/*, etc.  The end
> result is that git-svn gets horribly confused.
What options were used with git-svn init?  It certainly can support
multiple branch/tag directories:

init
  --tags=<tags_subdir>
  --branches=<branches_subdir>

  You can specify more than one --tags and/or --branches options, in
  case your Subversion repository places tags or branches under multiple
  paths.

                              -Dave

On Feb 28, 2011, at 11:25 AM, David A. Greene wrote:
> What options were used with git-svn init?  It certainly can support
> multiple branch/tag directories:
> 
> init
> --tags=<tags_subdir>
> --branches=<branches_subdir>
> 
> You can specify more than one --tags and/or --branches options, in
> case your Subversion repository places tags or branches under multiple
> paths.
I don't remember exactly what we tried, but as I recall it was the fact that
some of the branch directories were nested inside another branch directory that
got it all confused.

--Owen

>> I really, really hope this is the case.  The official git mirror
>> documentation says it is only trunk because the current branching
scheme
>> in not suitable for git.  I don't understand why that would be but
I'm
>> not a git-svn expert.
>
> It doesn't work because git-svn assumes that all of your branches begin
at the same position in the SVN tree, i.e. llvm/branches/*.  The problem is that
we have some branches in llvm/branches/*, some in llvm/branches/Apple/*, some in
llvm/branches/ggrief/*, etc.  The end result is that git-svn gets horribly
confused.
Same for tags. And current 2-level system will make stuff even worse
as it seems :)

-- 
With best regards, Anton Korobeynikov
Faculty of Mathematics and Mechanics, Saint Petersburg State University

> What options were used with git-svn init?  It certainly can support
> multiple branch/tag directories:
>
> init
>  --tags=<tags_subdir>
>  --branches=<branches_subdir>
>
>  You can specify more than one --tags and/or --branches options, in
>  case your Subversion repository places tags or branches under multiple
>  paths.
The svn repository is free to checkout. So, if you'll find a
reasonable combination of cmdline options (which will provide release
branches / tags only), then please let us know and we'll add the
branches/tags to the repository as well.

-- 
With best regards, Anton Korobeynikov
Faculty of Mathematics and Mechanics, Saint Petersburg State University