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>

diff --git a/git-svn.perl b/git-svn.perl
index 1a26843f44d687c5b89c118c31d5c088b41a1cb2..aceeca5a9487e47e281468d02ca10567b74217bf 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -2998,7 +2998,7 @@ sub find_extra_svk_parents {
        for my $ticket ( @tickets ) {
                my ($uuid, $path, $rev) = split /:/, $ticket;
                if ( $uuid eq $self->ra_uuid ) {
        for my $ticket ( @tickets ) {
                my ($uuid, $path, $rev) = split /:/, $ticket;
                if ( $uuid eq $self->ra_uuid ) {

-                       my $url = $self->rewrite_root || $self->{url};
+                       my $url = $self->{url};

                        my $repos_root = $url;
                        my $branch_from = $path;
                        $branch_from =~ s{^/}{};
                        my $repos_root = $url;
                        my $branch_from = $path;
                        $branch_from =~ s{^/}{};


@@ -3206,7 +3206,7 @@ sub find_extra_svn_parents {
        # are now marked as merge, we can add the tip as a parent.
        my @merges = split "\n", $mergeinfo;
        my @merge_tips;
        # are now marked as merge, we can add the tip as a parent.
        my @merges = split "\n", $mergeinfo;
        my @merge_tips;

-       my $url = $self->rewrite_root || $self->{url};
+       my $url = $self->{url};

        my $uuid = $self->ra_uuid;
        my %ranges;
        for my $merge ( @merges ) {
        my $uuid = $self->ra_uuid;
        my %ranges;
        for my $merge ( @merges ) {