# [PATCH 1/2] git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tip 3 messages from 2012-05-24 to 2012-05-24. Participants: Steven Walter, Eric Wong. Thread: https://gitlist.dev/t/30604 ## Steven Walter, 2012-05-24 00:40 Subject: [PATCH 1/2] git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tip Message-ID: <1337820046-4791-1-git-send-email-stevenrwalter@gmail.com> URL: https://gitlist.dev/e/1337820046-4791-1-git-send-email-stevenrwalter%40gmail.com ``` Consider the case where you have trunk, branchA of trunk, and branchB of branchA. trunk is merged back into branchB, and then branchB is reintegrated into trunk. The merge of branchB into trunk will have svn:mergeinfo property references to both branchA and branchB. When performing the check_cherry_pick check on branchB, it is necessary to eliminate the merged contents of branchA as well as branchB, or else the merge will be incorrectly ignored as a cherry-pick. Signed-off-by: Steven Walter --- git-svn.perl | 8 ++- t/t9163-git-svn-fetch-merge-branch-of-branch.sh | 60 +++++++++++++++++++++++ 2 files changed, 63 insertions(+), 5 deletions(-) create mode 100755 t/t9163-git-svn-fetch-merge-branch-of-branch.sh diff --git a/git-svn.perl b/git-svn.perl index ca038ec..abcec11 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -3657,14 +3657,14 @@ sub find_extra_svn_parents { my @merge_tips; my $url = $self->{url}; my $uuid = $self->ra_uuid; - my %ranges; + my @all_ranges; for my $merge ( @merges ) { my ($tip_commit, @ranges) = lookup_svn_merge( $uuid, $url, $merge ); unless (!$tip_commit or grep { $_ eq $tip_commit } @$parents ) { push @merge_tips, $tip_commit; - $ranges{$tip_commit} = \@ranges; + push @all_ranges, @ranges; } else { push @merge_tips, undef; } @@ -3679,8 +3679,6 @@ sub find_extra_svn_parents { my $spec = shift @merges; next unless $merge_tip and $excluded{$merge_tip}; - my $ranges = $ranges{$merge_tip}; - # check out 'new' tips my $merge_base; eval { @@ -3702,7 +3700,7 @@ sub find_extra_svn_parents { my (@incomplete) = check_cherry_pick( $merge_base, $merge_tip, $parents, - @$ranges, + @all_ranges, ); if ( @incomplete ) { diff --git a/t/t9163-git-svn-fetch-merge-branch-of-branch.sh b/t/t9163-git-svn-fetch-merge-branch-of-branch.sh new file mode 100755 index 0000000..58c7c56 --- /dev/null +++ b/t/t9163-git-svn-fetch-merge-branch-of-branch.sh @@ -0,0 +1,60 @@ +#!/bin/sh +# +# Copyright (c) 2010 Steven Walter +# + +test_description='git svn merge detection' +. ./lib-git-svn.sh + +svn_ver="$(svn --version --quiet)" +case $svn_ver in +0.* | 1.[0-4].*) + skip_all="skipping git-svn test - SVN too old ($svn_ver)" + test_done + ;; +esac + +test_expect_success 'initialize source svn repo' ' + svn_cmd mkdir -m x "$svnrepo"/trunk && + svn_cmd mkdir -m x "$svnrepo"/branches && + svn_cmd co "$svnrepo"/trunk "$SVN_TREE" && + ( + cd "$SVN_TREE" && + touch foo && + svn add foo && + svn commit -m "initial commit" && + svn cp -m branch "$svnrepo"/trunk "$svnrepo"/branches/branch1 && + svn switch "$svnrepo"/branches/branch1 && + touch bar && + svn add bar && + svn commit -m branch1 && + svn cp -m branch "$svnrepo"/branches/branch1 "$svnrepo"/branches/branch2 && + svn switch "$svnrepo"/branches/branch2 && + touch baz && + svn add baz && + svn commit -m branch2 && + svn switch "$svnrepo"/trunk && + touch bar2 && + svn add bar2 && + svn commit -m trunk && + svn switch "$svnrepo"/branches/branch2 && + svn merge "$svnrepo"/trunk && + svn commit -m "merge trunk" + svn switch "$svnrepo"/trunk && + svn merge --reintegrate "$svnrepo"/branches/branch2 && + svn commit -m "merge branch2" + ) && + rm -rf "$SVN_TREE" +' + +test_expect_success 'clone svn repo' ' + git svn init -s "$svnrepo" && + git svn fetch +' + +test_expect_success 'verify merge commit' 'x=$(git rev-parse HEAD^2) && + y=$(git rev-parse branch2) && + [ $x == $y ] +' + +test_done -- 1.7.9.5 ``` ## Steven Walter, 2012-05-24 00:40 Subject: [PATCH 2/2] git-svn.perl: keep processing all commits in parents_exclude Message-ID: <1337820046-4791-2-git-send-email-stevenrwalter@gmail.com> URL: https://gitlist.dev/e/1337820046-4791-2-git-send-email-stevenrwalter%40gmail.com In-Reply-To: <1337820046-4791-1-git-send-email-stevenrwalter@gmail.com> ``` This fixes a bug where git finds the incorrect merge parent. Consider a repository with trunk, branch1 of trunk, and branch2 of branch1. Without this change, git interprets a merge of branch2 into trunk as a merge of branch1 into trunk. Signed-off-by: Steven Walter --- git-svn.perl | 1 - t/t9164-git-svn-fetch-merge-branch-of-branch2.sh | 53 ++++++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100755 t/t9164-git-svn-fetch-merge-branch-of-branch2.sh diff --git a/git-svn.perl b/git-svn.perl index abcec11..c4678c1 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -3623,7 +3623,6 @@ sub parents_exclude { if ( $commit eq $excluded ) { push @excluded, $commit; $found++; - last; } else { push @new, $commit; diff --git a/t/t9164-git-svn-fetch-merge-branch-of-branch2.sh b/t/t9164-git-svn-fetch-merge-branch-of-branch2.sh new file mode 100755 index 0000000..fb48882 --- /dev/null +++ b/t/t9164-git-svn-fetch-merge-branch-of-branch2.sh @@ -0,0 +1,53 @@ +#!/bin/sh +# +# Copyright (c) 2010 Steven Walter +# + +test_description='git svn merge detection' +. ./lib-git-svn.sh + +svn_ver="$(svn --version --quiet)" +case $svn_ver in +0.* | 1.[0-4].*) + skip_all="skipping git-svn test - SVN too old ($svn_ver)" + test_done + ;; +esac + +test_expect_success 'initialize source svn repo' ' + svn_cmd mkdir -m x "$svnrepo"/trunk && + svn_cmd mkdir -m x "$svnrepo"/branches && + svn_cmd co "$svnrepo"/trunk "$SVN_TREE" && + ( + cd "$SVN_TREE" && + touch foo && + svn add foo && + svn commit -m "initial commit" && + svn cp -m branch "$svnrepo"/trunk "$svnrepo"/branches/branch1 && + svn switch "$svnrepo"/branches/branch1 && + touch bar && + svn add bar && + svn commit -m branch1 && + svn cp -m branch "$svnrepo"/branches/branch1 "$svnrepo"/branches/branch2 && + svn switch "$svnrepo"/branches/branch2 && + touch baz && + svn add baz && + svn commit -m branch2 && + svn switch "$svnrepo"/trunk && + svn merge --reintegrate "$svnrepo"/branches/branch2 && + svn commit -m "merge branch2" + ) && + rm -rf "$SVN_TREE" +' + +test_expect_success 'clone svn repo' ' + git svn init -s "$svnrepo" && + git svn fetch +' + +test_expect_success 'verify merge commit' 'x=$(git rev-parse HEAD^2) && + y=$(git rev-parse branch2) && + [ $x == $y ] +' + +test_done -- 1.7.9.5 ``` ## Eric Wong, 2012-05-24 03:02 Subject: Re: [PATCH 1/2] git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tip Message-ID: <20120524030255.GA23382@dcvr.yhbt.net> URL: https://gitlist.dev/e/20120524030255.GA23382%40dcvr.yhbt.net In-Reply-To: <1337820046-4791-1-git-send-email-stevenrwalter@gmail.com> ``` Steven Walter wrote: I'll wait for input on others who understand mergeinfo better than I do to chime in on the actual changes. Some nits on the tests: > +# Copyright (c) 2010 Steven Walter 2010? > +test_expect_success 'verify merge commit' 'x=$(git rev-parse HEAD^2) && > + y=$(git rev-parse branch2) && > + [ $x == $y ] == is a bash-ism, and we prefer 'test'. A single '=' works fine here, but it's probably better to prefix and quote if you're paranoid: test "x$x" = "x$y" ```