mirror of
https://github.com/git/git
synced 2024-09-20 17:01:35 +00:00
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
This commit is contained in:
commit
19a6477043
|
@ -2998,7 +2998,7 @@ sub find_extra_svk_parents {
|
||||||
for my $ticket ( @tickets ) {
|
for my $ticket ( @tickets ) {
|
||||||
my ($uuid, $path, $rev) = split /:/, $ticket;
|
my ($uuid, $path, $rev) = split /:/, $ticket;
|
||||||
if ( $uuid eq $self->ra_uuid ) {
|
if ( $uuid eq $self->ra_uuid ) {
|
||||||
my $url = $self->rewrite_root || $self->{url};
|
my $url = $self->{url};
|
||||||
my $repos_root = $url;
|
my $repos_root = $url;
|
||||||
my $branch_from = $path;
|
my $branch_from = $path;
|
||||||
$branch_from =~ s{^/}{};
|
$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.
|
# are now marked as merge, we can add the tip as a parent.
|
||||||
my @merges = split "\n", $mergeinfo;
|
my @merges = split "\n", $mergeinfo;
|
||||||
my @merge_tips;
|
my @merge_tips;
|
||||||
my $url = $self->rewrite_root || $self->{url};
|
my $url = $self->{url};
|
||||||
my $uuid = $self->ra_uuid;
|
my $uuid = $self->ra_uuid;
|
||||||
my %ranges;
|
my %ranges;
|
||||||
for my $merge ( @merges ) {
|
for my $merge ( @merges ) {
|
||||||
|
|
|
@ -11,6 +11,7 @@ test_expect_success 'load svk depot' "
|
||||||
svnadmin load -q '$rawsvnrepo' \
|
svnadmin load -q '$rawsvnrepo' \
|
||||||
< '$TEST_DIRECTORY/t9150/svk-merge.dump' &&
|
< '$TEST_DIRECTORY/t9150/svk-merge.dump' &&
|
||||||
git svn init --minimize-url -R svkmerge \
|
git svn init --minimize-url -R svkmerge \
|
||||||
|
--rewrite-root=http://svn.example.org \
|
||||||
-T trunk -b branches '$svnrepo' &&
|
-T trunk -b branches '$svnrepo' &&
|
||||||
git svn fetch --all
|
git svn fetch --all
|
||||||
"
|
"
|
||||||
|
|
|
@ -11,6 +11,7 @@ test_expect_success 'load svn dump' "
|
||||||
svnadmin load -q '$rawsvnrepo' \
|
svnadmin load -q '$rawsvnrepo' \
|
||||||
< '$TEST_DIRECTORY/t9151/svn-mergeinfo.dump' &&
|
< '$TEST_DIRECTORY/t9151/svn-mergeinfo.dump' &&
|
||||||
git svn init --minimize-url -R svnmerge \
|
git svn init --minimize-url -R svnmerge \
|
||||||
|
--rewrite-root=http://svn.example.org \
|
||||||
-T trunk -b branches '$svnrepo' &&
|
-T trunk -b branches '$svnrepo' &&
|
||||||
git svn fetch --all
|
git svn fetch --all
|
||||||
"
|
"
|
||||||
|
|
Loading…
Reference in a new issue