git-svn: Fix discarding of extra parents from svn:mergeinfo

suutari · Eric Wong · commit 6a2009e7f341 · 2010-02-26T01:30:23.000-08:00
If parent J is an ancestor of parent I, then parent J should be
discarded, not I.

Note that J is an ancestor of I if and only if rev-list I..J is emtpy,
which is what we are testing here.

Signed-off-by: Tuomas Suutari &lt;tuomas.suutari@gmail.com&gt;
Acked-by: Eric Wong &lt;normalperson@yhbt.net&gt;
diff --git a/git-svn.perl b/git-svn.perl
@@ -3273,7 +3273,7 @@ sub find_extra_svn_parents {
 					"$new_parents[$i]..$new_parents[$j]",
 				       );
 				if ( !$revs ) {
-					undef($new_parents[$i]);
+					undef($new_parents[$j]);
 				}
 			}
 		}
diff --git a/t/t9151-svn-mergeinfo.sh b/t/t9151-svn-mergeinfo.sh
@@ -33,7 +33,7 @@ test_expect_success 'svn non-merge merge commits did not become git merge commit
 	[ -z "$bad_non_merges" ]
 	'
 
-test_expect_failure 'commit made to merged branch is reachable from the merge' '
+test_expect_success 'commit made to merged branch is reachable from the merge' '
 	before_commit=$(git rev-list --all --grep="trunk commit before merging trunk to b2")
 	merge_commit=$(git rev-list --all --grep="Merge trunk to b2")
 	not_reachable=$(git rev-list -1 $before_commit --not $merge_commit)

Original file line number	Diff line number	Diff line change
`@@ -3273,7 +3273,7 @@ sub find_extra_svn_parents {`
`3273`	`3273`	`"$new_parents[$i]..$new_parents[$j]",`
`3274`	`3274`	`);`
`3275`	`3275`	`if ( !$revs ) {`
`3276`		`- undef($new_parents[$i]);`
	`3276`	`+ undef($new_parents[$j]);`
`3277`	`3277`	`}`
`3278`	`3278`	`}`
`3279`	`3279`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ test_expect_success 'svn non-merge merge commits did not become git merge commit`
`33`	`33`	`[ -z "$bad_non_merges" ]`
`34`	`34`	`'`
`35`	`35`
`36`		`-test_expect_failure 'commit made to merged branch is reachable from the merge' '`
	`36`	`+test_expect_success 'commit made to merged branch is reachable from the merge' '`
`37`	`37`	`before_commit=$(git rev-list --all --grep="trunk commit before merging trunk to b2")`
`38`	`38`	`merge_commit=$(git rev-list --all --grep="Merge trunk to b2")`
`39`	`39`	`not_reachable=$(git rev-list -1 $before_commit --not $merge_commit)`