Re: [PATCH] git svn clone -s was not prefixing 'branches/'

["Jon Lim" <snowblink@gmail.com>]

Hi,

Maybe this patch doesn't fix the problem I was having. I will attempt
to describe it better here.

I understand that a standard subversion setup is as follows:
trunk
branches
tags

With the -s option, svn clone should expect this.

Using the example subversion repository:
trunk
branches/RB_1.0
branches/RB_2.0
tags/REL_1.0
tags/REL_2.0

Currently, using the -s option you get:
trunk
RB_1.0
RB_2.0
tags/REL_1.0
tags/REL_2.0

I think it makes sense to have:
trunk
branches/RB_1.0
branches/RB_2.0
tags/REL_1.0
tags/REL_2.0

Regards,
Jon

On Sat, Jan 17, 2009 at 10:54, Eric Wong <normalperson@yhbt.net> wrote:
> Jonathan Lim <snowblink@gmail.com> wrote:
>> All branches in the subversion repository would appear at the same
>> level as trunk.  The should now appear with a 'branches/' prefix.
>>
>> Signed-off-by: Jonathan Lim <snowblink@gmail.com>
>
> This is too ugly for the common existing cases.  For the rare case where
> this could lead to a namespace conflict[1], it's possible to work around
> it by editing .git/config.
>
> I would accept a --tags-prefix= and --branches-prefix= patch to make
> this possible w/o having to edit .git/config, but I don't want the
> default prefixes changed.
>
> Thanks,
>
> [1] - "/branches/trunk" vs "/trunk", which I've yet to see evidence of...
>
>> ---
>>  git-svn.perl |    2 +-
>>  1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/git-svn.perl b/git-svn.perl
>> index ad01e18..17d65cb 100755
>> --- a/git-svn.perl
>> +++ b/git-svn.perl
>> @@ -789,7 +789,7 @@ sub cmd_multi_init {
>>       }
>>       return unless defined $_branches || defined $_tags;
>>       my $ra = $url ? Git::SVN::Ra->new($url) : undef;
>> -     complete_url_ls_init($ra, $_branches, '--branches/-b', $_prefix);
>> +     complete_url_ls_init($ra, $_branches, '--branches/-b', $_prefix . 'branches/');
>>       complete_url_ls_init($ra, $_tags, '--tags/-t', $_prefix . 'tags/');
>>  }
>



-- 
http://snowblink.co.uk/