diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-13 12:02:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-13 12:02:54 -0800 |
| commit | 19a64770435c72721dece82c52468f70745e9a95 (patch) | |
| tree | 3f2665d896c89041c2d7af739b7607d9c30747f7 | |
| parent | 809780b662355a9ded05b450a07bbe79d0d2e26e (diff) | |
| parent | 95109f29475a0ffc5ed4d2be1e95b01062ad1e94 (diff) | |
| download | git-19a64770435c72721dece82c52468f70745e9a95.tar.gz git-19a64770435c72721dece82c52468f70745e9a95.tar.xz | |
Merge git://git.bogomips.org/git-svn
* git://git.bogomips.org/git-svn:
t9150,t9151: Add rewrite-root option to init
git-svn: Fix merge detecting with rewrite-root
| -rwxr-xr-x | git-svn.perl | 4 | ||||
| -rwxr-xr-x | t/t9150-svk-mergetickets.sh | 1 | ||||
| -rwxr-xr-x | t/t9151-svn-mergeinfo.sh | 1 |
3 files changed, 4 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 ) { diff --git a/t/t9150-svk-mergetickets.sh b/t/t9150-svk-mergetickets.sh index 53581425c..24c2421bf 100755 --- a/t/t9150-svk-mergetickets.sh +++ b/t/t9150-svk-mergetickets.sh @@ -11,6 +11,7 @@ test_expect_success 'load svk depot' " svnadmin load -q '$rawsvnrepo' \ < '$TEST_DIRECTORY/t9150/svk-merge.dump' && git svn init --minimize-url -R svkmerge \ + --rewrite-root=http://svn.example.org \ -T trunk -b branches '$svnrepo' && git svn fetch --all " diff --git a/t/t9151-svn-mergeinfo.sh b/t/t9151-svn-mergeinfo.sh index 16408244d..250c651ea 100755 --- a/t/t9151-svn-mergeinfo.sh +++ b/t/t9151-svn-mergeinfo.sh @@ -11,6 +11,7 @@ test_expect_success 'load svn dump' " svnadmin load -q '$rawsvnrepo' \ < '$TEST_DIRECTORY/t9151/svn-mergeinfo.dump' && git svn init --minimize-url -R svnmerge \ + --rewrite-root=http://svn.example.org \ -T trunk -b branches '$svnrepo' && git svn fetch --all " |