* Re: [PATCH v2 1/2] git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tip
[not found] <1344257176-17116-1-git-send-email-stevenrwalter@gmail.com>
@ 2012-08-07 0:47 ` Eric Wong
[not found] ` <1344257176-17116-2-git-send-email-stevenrwalter@gmail.com>
1 sibling, 0 replies; 2+ messages in thread
From: Eric Wong @ 2012-08-07 0:47 UTC (permalink / raw)
To: Steven Walter; +Cc: avarab, git, Sam Vilain
Steven Walter <stevenrwalter@gmail.com> 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.
Thanks Steven, Cc-ing Sam for mergeinfo stuff.
> ---
> 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..73cdda5
> --- /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 add foo &&
svn_cmd here, too
> + 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) &&
> + test "x$x" = "x$y"
> +'
> +
> +test_done
> --
> 1.7.9.5
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH v2 2/2] git-svn.perl: keep processing all commits in parents_exclude
[not found] ` <1344257176-17116-2-git-send-email-stevenrwalter@gmail.com>
@ 2012-08-07 0:48 ` Eric Wong
0 siblings, 0 replies; 2+ messages in thread
From: Eric Wong @ 2012-08-07 0:48 UTC (permalink / raw)
To: Sam Vilain; +Cc: avarab, git, Steven Walter
Steven Walter <stevenrwalter@gmail.com> 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.
Sam: your eyes would be much appreciated for this series, thanks :)
> ---
> 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..3493de1
> --- /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 add foo &&
svn_cmd here, too
> + 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) &&
> + test "x$x" = "x$y"
> +'
> +
> +test_done
> --
> 1.7.9.5
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-08-07 0:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <1344257176-17116-1-git-send-email-stevenrwalter@gmail.com>
2012-08-07 0:47 ` [PATCH v2 1/2] git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tip Eric Wong
[not found] ` <1344257176-17116-2-git-send-email-stevenrwalter@gmail.com>
2012-08-07 0:48 ` [PATCH v2 2/2] git-svn.perl: keep processing all commits in parents_exclude Eric Wong
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.