git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tip
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 <stevenrwalter@gmail.com> Reviewed-by: Sam Vilain <sam@vilain.net> Signed-off-by: Eric Wong <normalperson@yhbt.net>
Steven Walter committed
Aug 19, 2012 at 21:39 UTC
f271fad2661d2f26654e9b4b3ecb17ad0ea711e8
2 files changed
+63
-5
perl/Git/SVN.pm
+3
-5
@@ -1713,14 +1713,14 @@ sub find_extra_svn_parents {
1713
my @merge_tips;
1714
my $url = $self->url;
1715
my $uuid = $self->ra_uuid;
1716
- my %ranges;
1716
+ my @all_ranges;
1717
for my $merge ( @merges ) {
1718
my ($tip_commit, @ranges) =
1719
lookup_svn_merge( $uuid, $url, $merge );
1720
unless (!$tip_commit or
1721
grep { $_ eq $tip_commit } @$parents ) {
1722
push @merge_tips, $tip_commit;
1723
- $ranges{$tip_commit} = \@ranges;
1723
+ push @all_ranges, @ranges;
1724
} else {
1725
push @merge_tips, undef;
1726
}
@@ -1735,8 +1735,6 @@ sub find_extra_svn_parents {
1735
my $spec = shift @merges;
1736
next unless $merge_tip and $excluded{$merge_tip};
1737
1738
- my $ranges = $ranges{$merge_tip};
1739
-
1738
# check out 'new' tips
1739
my $merge_base;
1740
eval {
@@ -1758,7 +1756,7 @@ sub find_extra_svn_parents {
1756
my (@incomplete) = check_cherry_pick(
1757
$merge_base, $merge_tip,
1758
$parents,
1761
- @$ranges,
1759
+ @all_ranges,
1760
);
1761
1762
if ( @incomplete ) {
t/t9165-git-svn-fetch-merge-branch-of-branch.sh
new
+60
@@ -0,0 +1,60 @@
1
+#!/bin/sh
2
+#
3
+# Copyright (c) 2012 Steven Walter
4
+#
5
+
6
+test_description='git svn merge detection'
7
+. ./lib-git-svn.sh
8
+
9
+svn_ver="$(svn --version --quiet)"
10
+case $svn_ver in
11
+0.* | 1.[0-4].*)
12
+ skip_all="skipping git-svn test - SVN too old ($svn_ver)"
13
+ test_done
14
+ ;;
15
+esac
16
+
17
+test_expect_success 'initialize source svn repo' '
18
+ svn_cmd mkdir -m x "$svnrepo"/trunk &&
19
+ svn_cmd mkdir -m x "$svnrepo"/branches &&
20
+ svn_cmd co "$svnrepo"/trunk "$SVN_TREE" &&
21
+ (
22
+ cd "$SVN_TREE" &&
23
+ touch foo &&
24
+ svn_cmd add foo &&
25
+ svn_cmd commit -m "initial commit" &&
26
+ svn_cmd cp -m branch "$svnrepo"/trunk "$svnrepo"/branches/branch1 &&
27
+ svn_cmd switch "$svnrepo"/branches/branch1 &&
28
+ touch bar &&
29
+ svn_cmd add bar &&
30
+ svn_cmd commit -m branch1 &&
31
+ svn_cmd cp -m branch "$svnrepo"/branches/branch1 "$svnrepo"/branches/branch2 &&
32
+ svn_cmd switch "$svnrepo"/branches/branch2 &&
33
+ touch baz &&
34
+ svn_cmd add baz &&
35
+ svn_cmd commit -m branch2 &&
36
+ svn_cmd switch "$svnrepo"/trunk &&
37
+ touch bar2 &&
38
+ svn_cmd add bar2 &&
39
+ svn_cmd commit -m trunk &&
40
+ svn_cmd switch "$svnrepo"/branches/branch2 &&
41
+ svn_cmd merge "$svnrepo"/trunk &&
42
+ svn_cmd commit -m "merge trunk"
43
+ svn_cmd switch "$svnrepo"/trunk &&
44
+ svn_cmd merge --reintegrate "$svnrepo"/branches/branch2 &&
45
+ svn_cmd commit -m "merge branch2"
46
+ ) &&
47
+ rm -rf "$SVN_TREE"
48
+'
49
+
50
+test_expect_success 'clone svn repo' '
51
+ git svn init -s "$svnrepo" &&
52
+ git svn fetch
53
+'
54
+
55
+test_expect_success 'verify merge commit' 'x=$(git rev-parse HEAD^2) &&
56
+ y=$(git rev-parse branch2) &&
57
+ test "x$x" = "x$y"
58
+'
59
+
60
+test_done