summaryrefslogtreecommitdiff
path: root/git-svn.perl
diff options
context:
space:
mode:
authorTuomas Suutari <tuomas.suutari@gmail.com>2010-02-24 18:09:01 (GMT)
committerEric Wong <normalperson@yhbt.net>2010-03-13 09:16:17 (GMT)
commitbf60fff8f1e814e1603328141b68686337a5a0b5 (patch)
tree2ebced53757e184e6f5a9dad190f34f565c1e81d /git-svn.perl
parent90a2bf9ca155c8e0e43d9e30197d9562dd02ea96 (diff)
downloadgit-bf60fff8f1e814e1603328141b68686337a5a0b5.zip
git-bf60fff8f1e814e1603328141b68686337a5a0b5.tar.gz
git-bf60fff8f1e814e1603328141b68686337a5a0b5.tar.bz2
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-xgit-svn.perl4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-svn.perl b/git-svn.perl
index 1a26843..aceeca5 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 ) {