diff options
| author | Tuomas Suutari <tuomas.suutari@gmail.com> | 2010-02-24 20:09:01 +0200 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2010-03-13 01:16:17 -0800 |
| commit | bf60fff8f1e814e1603328141b68686337a5a0b5 (patch) | |
| tree | 2ebced53757e184e6f5a9dad190f34f565c1e81d /git-svn.perl | |
| parent | 90a2bf9ca155c8e0e43d9e30197d9562dd02ea96 (diff) | |
| download | git-bf60fff8f1e814e1603328141b68686337a5a0b5.tar.gz git-bf60fff8f1e814e1603328141b68686337a5a0b5.tar.xz | |
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>
Diffstat (limited to 'git-svn.perl')
| -rwxr-xr-x | git-svn.perl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-svn.perl b/git-svn.perl index 1a26843f4..aceeca5a9 100755 --- 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 ) { - my $url = $self->rewrite_root || $self->{url}; + my $url = $self->{url}; 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; - my $url = $self->rewrite_root || $self->{url}; + my $url = $self->{url}; my $uuid = $self->ra_uuid; my %ranges; for my $merge ( @merges ) { |