# [PATCH v3 1/2] git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tip 13 messages from 2012-08-11 to 2012-08-21. Participants: Steven Walter, Eric Wong, Sam Vilain, Junio C Hamano. Thread: https://gitlist.dev/t/31236 ## Steven Walter, 2012-08-11 17:14 Subject: [PATCH v3 1/2] git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tip Message-ID: <1344705265-10939-1-git-send-email-stevenrwalter@gmail.com> URL: https://gitlist.dev/e/1344705265-10939-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..13ae7e3 --- /dev/null +++ b/t/t9163-git-svn-fetch-merge-branch-of-branch.sh @@ -0,0 +1,60 @@ +#!/bin/sh +# +# Copyright (c) 2012 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_cmd add foo && + svn_cmd commit -m "initial commit" && + svn_cmd cp -m branch "$svnrepo"/trunk "$svnrepo"/branches/branch1 && + svn_cmd switch "$svnrepo"/branches/branch1 && + touch bar && + svn_cmd add bar && + svn_cmd commit -m branch1 && + svn_cmd cp -m branch "$svnrepo"/branches/branch1 "$svnrepo"/branches/branch2 && + svn_cmd switch "$svnrepo"/branches/branch2 && + touch baz && + svn_cmd add baz && + svn_cmd commit -m branch2 && + svn_cmd switch "$svnrepo"/trunk && + touch bar2 && + svn_cmd add bar2 && + svn_cmd commit -m trunk && + svn_cmd switch "$svnrepo"/branches/branch2 && + svn_cmd merge "$svnrepo"/trunk && + svn_cmd commit -m "merge trunk" + svn_cmd switch "$svnrepo"/trunk && + svn_cmd merge --reintegrate "$svnrepo"/branches/branch2 && + svn_cmd 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) && + test "x$x" = "x$y" +' + +test_done -- 1.7.9.5 ``` ## Steven Walter, 2012-08-11 17:14 Subject: [PATCH v3 2/2] git-svn.perl: keep processing all commits in parents_exclude Message-ID: <1344705265-10939-2-git-send-email-stevenrwalter@gmail.com> URL: https://gitlist.dev/e/1344705265-10939-2-git-send-email-stevenrwalter%40gmail.com In-Reply-To: <1344705265-10939-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..af0ec0e --- /dev/null +++ b/t/t9164-git-svn-fetch-merge-branch-of-branch2.sh @@ -0,0 +1,53 @@ +#!/bin/sh +# +# Copyright (c) 2012 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_cmd add foo && + svn_cmd commit -m "initial commit" && + svn_cmd cp -m branch "$svnrepo"/trunk "$svnrepo"/branches/branch1 && + svn_cmd switch "$svnrepo"/branches/branch1 && + touch bar && + svn_cmd add bar && + svn_cmd commit -m branch1 && + svn_cmd cp -m branch "$svnrepo"/branches/branch1 "$svnrepo"/branches/branch2 && + svn_cmd switch "$svnrepo"/branches/branch2 && + touch baz && + svn_cmd add baz && + svn_cmd commit -m branch2 && + svn_cmd switch "$svnrepo"/trunk && + svn_cmd merge --reintegrate "$svnrepo"/branches/branch2 && + svn_cmd 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) && + test "x$x" = "x$y" +' + +test_done -- 1.7.9.5 ``` ## Eric Wong, 2012-08-13 07:08 Subject: Re: [PATCH v3 1/2] git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tip Message-ID: <20120813070850.GA9190@dcvr.yhbt.net> URL: https://gitlist.dev/e/20120813070850.GA9190%40dcvr.yhbt.net In-Reply-To: <1344705265-10939-1-git-send-email-stevenrwalter@gmail.com> ``` Steven Walter wrote: > 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 > --- I think this series is good, but would feel more comfortable if I got a second opinion from Sam. This doesn't apply against Junio's master (nor mine on git://bogomips.org/git-svn.git), though it works fine on Junio's maint. > 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..13ae7e3 > --- /dev/null > +++ b/t/t9163-git-svn-fetch-merge-branch-of-branch.sh > @@ -0,0 +1,60 @@ > +#!/bin/sh > +# > +# Copyright (c) 2012 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_cmd add foo && > + svn_cmd commit -m "initial commit" && > + svn_cmd cp -m branch "$svnrepo"/trunk "$svnrepo"/branches/branch1 && > + svn_cmd switch "$svnrepo"/branches/branch1 && > + touch bar && > + svn_cmd add bar && > + svn_cmd commit -m branch1 && > + svn_cmd cp -m branch "$svnrepo"/branches/branch1 "$svnrepo"/branches/branch2 && > + svn_cmd switch "$svnrepo"/branches/branch2 && > + touch baz && > + svn_cmd add baz && > + svn_cmd commit -m branch2 && > + svn_cmd switch "$svnrepo"/trunk && > + touch bar2 && > + svn_cmd add bar2 && > + svn_cmd commit -m trunk && > + svn_cmd switch "$svnrepo"/branches/branch2 && > + svn_cmd merge "$svnrepo"/trunk && > + svn_cmd commit -m "merge trunk" > + svn_cmd switch "$svnrepo"/trunk && > + svn_cmd merge --reintegrate "$svnrepo"/branches/branch2 && > + svn_cmd 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) && > + test "x$x" = "x$y" > +' > + > +test_done > -- > 1.7.9.5 ``` ## Sam Vilain, 2012-08-18 19:49 Subject: Re: [PATCH v3 1/2] git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tip Message-ID: <502FF1BF.104@vilain.net> URL: https://gitlist.dev/e/502FF1BF.104%40vilain.net In-Reply-To: <1344705265-10939-1-git-send-email-stevenrwalter@gmail.com> ``` On 08/11/2012 10:14 AM, Steven Walter wrote: > 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. Nice start, and then... > When > performing the check_cherry_pick check on branchB, You switch from a user story to an implementation detail. Perhaps you could state the user action which is affected here and mention the implementation details in parentheses. > 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, > ); This all looks very plausibly correct. > 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..13ae7e3 > --- /dev/null > +++ b/t/t9163-git-svn-fetch-merge-branch-of-branch.sh > @@ -0,0 +1,60 @@ > +#!/bin/sh > +# > +# Copyright (c) 2012 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_cmd add foo && > + svn_cmd commit -m "initial commit" && > + svn_cmd cp -m branch "$svnrepo"/trunk "$svnrepo"/branches/branch1 && > + svn_cmd switch "$svnrepo"/branches/branch1 && You refer to these as "branchA" and "branchB" in your commit message. It would be easier to follow if you were consistent. Otherwise, nice fix. I'm glad that someone is finding the corner cases in this code! :) Sam ``` ## Sam Vilain, 2012-08-18 19:51 Subject: Re: [PATCH v3 2/2] git-svn.perl: keep processing all commits in parents_exclude Message-ID: <502FF250.6010402@vilain.net> URL: https://gitlist.dev/e/502FF250.6010402%40vilain.net In-Reply-To: <1344705265-10939-2-git-send-email-stevenrwalter@gmail.com> ``` On 08/11/2012 10:14 AM, Steven Walter wrote: > 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; > } I could believe that, too. I like this change: one line of code, 53 lines of test and a paragraph of explanation :-). Cheers, Sam. ``` ## Steven Walter, 2012-08-18 20:43 Subject: Re: [PATCH v3 2/2] git-svn.perl: keep processing all commits in parents_exclude Message-ID: URL: https://gitlist.dev/e/CAK8d-aKMsSQGMmLrUFDCr1VDbxGPVsPJFgR%3DOkd-%3D7BV3AjzOQ%40mail.gmail.com In-Reply-To: <502FF250.6010402@vilain.net> ``` On Sat, Aug 18, 2012 at 3:51 PM, Sam Vilain wrote: > On 08/11/2012 10:14 AM, Steven Walter wrote: >> >> 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; >> } > > > I could believe that, too. I like this change: one line of code, 53 lines > of test and a paragraph of explanation :-). How about a Signed-Off-By? -- -Steven Walter ``` ## Sam Vilain, 2012-08-18 23:37 Subject: Re: [PATCH v3 2/2] git-svn.perl: keep processing all commits in parents_exclude Message-ID: <50302736.9060404@vilain.net> URL: https://gitlist.dev/e/50302736.9060404%40vilain.net In-Reply-To: ``` -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 On 08/18/2012 01:43 PM, Steven Walter wrote: > How about a Signed-Off-By? Signed-Off-By: Sam Vilain Sam -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQEcBAEBCgAGBQJQMCcnAAoJEBdtaL3wGtIoJ1UIAIJ6Xz5OEMmMk1tq546eggHg I+sJIFjqg+mo53VqT0/bKhqg8sLx8F/Gda15nwOUMcslKJdA+sCc+QhAtgSWJ1WK Idw59jtZHbabfopBHNgneSqVBhXSKpNw3e3EvlRVkK1wobO0+c0X6YkBG0eBCZl2 6RYXIAb6jX04k1hSrnxcPn+REkoyl31aEuFBPNz0wRWHjju+G6bPY/x7D/gO1YOc /uRQXveQngJOLwawDR+dGS+0aWPseX/sbZqsVFo0hVQYqoHt+s4uVuriBfHSRKd+ R1eUoY0ikW4UvEwZX74Zf3SeoVLLFnkCW8B5XsGb10IojbvY3uyYevATXI79j1Y= =Lb7H -----END PGP SIGNATURE----- ``` ## Junio C Hamano, 2012-08-18 23:43 Subject: Re: [PATCH v3 2/2] git-svn.perl: keep processing all commits in parents_exclude Message-ID: <7vipcfrckn.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vipcfrckn.fsf%40alter.siamese.dyndns.org In-Reply-To: <50302736.9060404@vilain.net> ``` Sam Vilain writes: > On 08/18/2012 01:43 PM, Steven Walter wrote: > > How about a Signed-Off-By? > > Signed-Off-By: Sam Vilain I think you meant reviewed-by or acked-by? ``` ## Eric Wong, 2012-08-19 19:33 Subject: Re: [PATCH v3 2/2] git-svn.perl: keep processing all commits in parents_exclude Message-ID: <20120819193356.GA6203@dcvr.yhbt.net> URL: https://gitlist.dev/e/20120819193356.GA6203%40dcvr.yhbt.net In-Reply-To: ``` Steven Walter wrote: > On Sat, Aug 18, 2012 at 3:51 PM, Sam Vilain wrote: > > On 08/11/2012 10:14 AM, Steven Walter wrote: > >> --- > >> git-svn.perl | 1 - > >> t/t9164-git-svn-fetch-merge-branch-of-branch2.sh | 53 > >> ++++++++++++++++++++++ Thanks all. Steven: This doesn't apply cleanly to master since git-svn.perl is split into separate files (git-svn.perl -> perl/Git/SVN*) Can you rebase against Junio's current master? Thanks again. ``` ## Steven Walter, 2012-08-20 01:39 Subject: [PATCH 1/2] git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tip Message-ID: <1345426781-7754-1-git-send-email-stevenrwalter@gmail.com> URL: https://gitlist.dev/e/1345426781-7754-1-git-send-email-stevenrwalter%40gmail.com In-Reply-To: <20120819193356.GA6203@dcvr.yhbt.net> ``` Consider the case where you have trunk, branch1 of trunk, and branch2 of branch1. trunk is merged back into branch2, and then branch2 is reintegrated into trunk. The merge of branch2 into trunk will have svn:mergeinfo property references to both branch1 and branch2. When git-svn fetches the commit that merges branch2 (check_cherry_pick), it is necessary to eliminate the merged contents of branch1 as well as branch2, or else the merge will be incorrectly ignored as a cherry-pick. Signed-off-by: Steven Walter --- perl/Git/SVN.pm | 8 ++- t/t9165-git-svn-fetch-merge-branch-of-branch.sh | 60 +++++++++++++++++++++++ 2 files changed, 63 insertions(+), 5 deletions(-) create mode 100755 t/t9165-git-svn-fetch-merge-branch-of-branch.sh diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm index 8478d0c..2707003 100644 --- a/perl/Git/SVN.pm +++ b/perl/Git/SVN.pm @@ -1695,14 +1695,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; } @@ -1717,8 +1717,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 { @@ -1740,7 +1738,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/t9165-git-svn-fetch-merge-branch-of-branch.sh b/t/t9165-git-svn-fetch-merge-branch-of-branch.sh new file mode 100755 index 0000000..13ae7e3 --- /dev/null +++ b/t/t9165-git-svn-fetch-merge-branch-of-branch.sh @@ -0,0 +1,60 @@ +#!/bin/sh +# +# Copyright (c) 2012 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_cmd add foo && + svn_cmd commit -m "initial commit" && + svn_cmd cp -m branch "$svnrepo"/trunk "$svnrepo"/branches/branch1 && + svn_cmd switch "$svnrepo"/branches/branch1 && + touch bar && + svn_cmd add bar && + svn_cmd commit -m branch1 && + svn_cmd cp -m branch "$svnrepo"/branches/branch1 "$svnrepo"/branches/branch2 && + svn_cmd switch "$svnrepo"/branches/branch2 && + touch baz && + svn_cmd add baz && + svn_cmd commit -m branch2 && + svn_cmd switch "$svnrepo"/trunk && + touch bar2 && + svn_cmd add bar2 && + svn_cmd commit -m trunk && + svn_cmd switch "$svnrepo"/branches/branch2 && + svn_cmd merge "$svnrepo"/trunk && + svn_cmd commit -m "merge trunk" + svn_cmd switch "$svnrepo"/trunk && + svn_cmd merge --reintegrate "$svnrepo"/branches/branch2 && + svn_cmd 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) && + test "x$x" = "x$y" +' + +test_done -- 1.7.9.5 ``` ## Steven Walter, 2012-08-20 01:39 Subject: [PATCH 2/2] git-svn.perl: keep processing all commits in parents_exclude Message-ID: <1345426781-7754-2-git-send-email-stevenrwalter@gmail.com> URL: https://gitlist.dev/e/1345426781-7754-2-git-send-email-stevenrwalter%40gmail.com In-Reply-To: <1345426781-7754-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 --- perl/Git/SVN.pm | 1 - t/t9166-git-svn-fetch-merge-branch-of-branch2.sh | 53 ++++++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100755 t/t9166-git-svn-fetch-merge-branch-of-branch2.sh diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm index 2707003..e48ba46 100644 --- a/perl/Git/SVN.pm +++ b/perl/Git/SVN.pm @@ -1661,7 +1661,6 @@ sub parents_exclude { if ( $commit eq $excluded ) { push @excluded, $commit; $found++; - last; } else { push @new, $commit; diff --git a/t/t9166-git-svn-fetch-merge-branch-of-branch2.sh b/t/t9166-git-svn-fetch-merge-branch-of-branch2.sh new file mode 100755 index 0000000..af0ec0e --- /dev/null +++ b/t/t9166-git-svn-fetch-merge-branch-of-branch2.sh @@ -0,0 +1,53 @@ +#!/bin/sh +# +# Copyright (c) 2012 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_cmd add foo && + svn_cmd commit -m "initial commit" && + svn_cmd cp -m branch "$svnrepo"/trunk "$svnrepo"/branches/branch1 && + svn_cmd switch "$svnrepo"/branches/branch1 && + touch bar && + svn_cmd add bar && + svn_cmd commit -m branch1 && + svn_cmd cp -m branch "$svnrepo"/branches/branch1 "$svnrepo"/branches/branch2 && + svn_cmd switch "$svnrepo"/branches/branch2 && + touch baz && + svn_cmd add baz && + svn_cmd commit -m branch2 && + svn_cmd switch "$svnrepo"/trunk && + svn_cmd merge --reintegrate "$svnrepo"/branches/branch2 && + svn_cmd 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) && + test "x$x" = "x$y" +' + +test_done -- 1.7.9.5 ``` ## Eric Wong, 2012-08-21 22:05 Subject: Re: [PATCH 1/2] git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tip Message-ID: <20120821220556.GA5848@dcvr.yhbt.net> URL: https://gitlist.dev/e/20120821220556.GA5848%40dcvr.yhbt.net In-Reply-To: <1345426781-7754-1-git-send-email-stevenrwalter@gmail.com> ``` Steven Walter wrote: > Consider the case where you have trunk, branch1 of trunk, and branch2 of > branch1. trunk is merged back into branch2, and then branch2 is > reintegrated into trunk. The merge of branch2 into trunk will have > svn:mergeinfo property references to both branch1 and branch2. When > git-svn fetches the commit that merges branch2 (check_cherry_pick), > it is necessary to eliminate the merged contents of branch1 as well as > branch2, or else the merge will be incorrectly ignored as a cherry-pick. > > Signed-off-by: Steven Walter Thanks, I've Signed-off (also added Sam's Reviewed-by) and pushed to "for-git-master" on git://bogomips.org/git-svn (Will wait on a few other patches before asking Junio to pull) ``` ## Junio C Hamano, 2012-08-21 22:38 Subject: Re: [PATCH 1/2] git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tip Message-ID: <7vobm3c1lg.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vobm3c1lg.fsf%40alter.siamese.dyndns.org In-Reply-To: <20120821220556.GA5848@dcvr.yhbt.net> ``` Eric Wong writes: > Steven Walter wrote: >> Consider the case where you have trunk, branch1 of trunk, and branch2 of >> branch1. trunk is merged back into branch2, and then branch2 is >> reintegrated into trunk. The merge of branch2 into trunk will have >> svn:mergeinfo property references to both branch1 and branch2. When >> git-svn fetches the commit that merges branch2 (check_cherry_pick), >> it is necessary to eliminate the merged contents of branch1 as well as >> branch2, or else the merge will be incorrectly ignored as a cherry-pick. >> >> Signed-off-by: Steven Walter > > Thanks, I've Signed-off (also added Sam's Reviewed-by) and > pushed to "for-git-master" on git://bogomips.org/git-svn > > (Will wait on a few other patches before asking Junio to pull) If there are stuff that should go to 1.7.12 maintenance track, please separate them from new features and risky improvements. Thanks. ```