[PATCH 1/2] git-svn: Fix merge detecting with rewrite-root

[Tuomas Suutari <tuomas.suutari@gmail.com>]

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>
---
Hi again,

now I found another problem while importing SVN repo with git-svn.

To speed-up the import, I copied the SVN repo with rsync to localhost
and used file:// URL for the import, but because I want to be able to
track the history with svn+ssh:// later, I used the rewrite-root
option. That seemed to break the merge detecting.

With this patch the merge detecting works also with rewrite-root
option, but since there are no comments why the $self->rewrite_root
was used in the first place, I have no idea, if this is the right
thing to do.

 git-svn.perl |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/git-svn.perl b/git-svn.perl
index 265852f..1cbddca 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -2993,7 +2993,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{^/}{};
@@ -3201,7 +3201,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 ) {
-- 
1.7.0.2.ged48