git-svn: Fix merge detecting with rewrite-root
Detecting of merges from svn:mergeinfo or svk merge tickets failed with rewrite-root option. This fixes it. Signed-off-by: Tuomas Suutari <tuomas.suutari@gmail.com> Acked-by: Eric Wong <normalperson@yhbt.net>
Tuomas Suutari committed
Feb 24, 2010 at 20:09 UTC
bf60fff8f1e814e1603328141b68686337a5a0b5
1 file changed
+2
-2
git-svn.perl
+2
-2
@@ -2998,7 +2998,7 @@ sub find_extra_svk_parents {
2998
for my $ticket ( @tickets ) {
2999
my ($uuid, $path, $rev) = split /:/, $ticket;
3000
if ( $uuid eq $self->ra_uuid ) {
3001
- my $url = $self->rewrite_root || $self->{url};
3001
+ my $url = $self->{url};
3002
my $repos_root = $url;
3003
my $branch_from = $path;
3004
$branch_from =~ s{^/}{};
@@ -3206,7 +3206,7 @@ sub find_extra_svn_parents {
3206
# are now marked as merge, we can add the tip as a parent.
3207
my @merges = split "\n", $mergeinfo;
3208
my @merge_tips;
3209
- my $url = $self->rewrite_root || $self->{url};
3209
+ my $url = $self->{url};
3210
my $uuid = $self->ra_uuid;
3211
my %ranges;
3212
for my $merge ( @merges ) {