git-svn: SVK merge commits can have >2 parents

Heya,

While converting a mildly complicated svn repository that was managed with SVK, I ran across the following oddness. svk smerge can only merge between _two_ branches at once -- however, the way that svk merge detection works, you can end up with erroneous extra parents from long-dead branches. Case in point:

export SVKROOT=/tmp/svk-testing-$$
svk mkdir //trunk -m 'trunk'
svk mkdir //branches -m 'branches'
svk co //trunk
svk cp //trunk/ //branches/feature1 -m 'branch for feature1' svk cp //trunk/ //branches/feature2 -m 'branch for feature2' svk co //branches/feature1
cd feature1
echo "foo" >foo
svk add foo
svk ci -m 'feature1 development'
svk sm //branches/feature1 //trunk -m 'merge feature1 to trunk' cd ..
svk co //branches/feature2
cd feature2
echo "bar" >bar
svk add bar
svk ci -m 'feature2 development'
svk sm //trunk //branches/feature2 -m 'merge from trunk' cd ..

git svn clone -s file://$SVKROOT/local

The 'feature2' branch will appear to have three parents: r7, r6, _and_ r5. The r5 parent is extraneous, and only appears because r5 was previously merged into trunk, as part of r6.

Given this, I'm a little confused why find_extra_svk_parents is written the way that it is, in seemingly allowing multiple extra parents to be found. Since the most recent (i.e., highest-numbered) change is by definition the only one that can account for all of the other svk:merge changes, I _believe_ the attached diff to be correct, but I'm unsure because of the implicit current assumption that smerges can produce multiple parents.

- Alex

Networking -- only one letter away from not working

From b86b4bb0cecb70d828558b046aa0b3e7b899bf41 Mon Sep 17 00:00:00 2001
From: Alex Vandiver <[email protected]>
Date: Sun, 29 Nov 2009 02:20:21 -0500
Subject: [PATCH] git-svn: svk merge commits should only add one exta parent

When merging branches based on svk:merge properties, a single merge can have updated or added multiple svk:merge lines. If so. only include the minimal set of new parents.

---
 git-svn.perl |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

index 957d44e..668e50c 100755
@@ -2940,10 +2940,12 @@ sub find_extra_svk_parents {
 			if ( my $commit = $gs->rev_map_get($rev, $uuid) ) {
 				# wahey!  we found it, but it might be
 				# an old one (!)
-				push @known_parents, $commit;
+				push @known_parents, [ $rev, $commit ];
 			}
 		}
 	}
+	# We only care about the highest-numbered applicable commit
+	@known_parents = map {$_->[1]} sort {$b->[0] <=> $a->[0]} @known_parents;
 	for my $parent ( @known_parents ) {
 		my @cmd = ('rev-list', $parent, map { "^$_" } @$parents );
 		my ($msg_fh, $ctx) = command_output_pipe(@cmd);

@@ -2956,6 +2958,7 @@ sub find_extra_svk_parents {
 			print STDERR
 			    "Found merge parent (svk:merge ticket): $parent\n";
 			push @$parents, $parent;
+			return;
 		}
 	}
 }

1.6.6.rc0.254.g7352d

Upon a little more inspection, I now understand that the rev-parse lines in find_extra_svk_parents are attempting to deal with this exact circumstance -- but they fail to properly sort the merge tickets first, which leads to this incorrect behavior. Armed with this understanding, I'm more confident in the attached updated patch. I assume, however, that the logic allows for more than one extra parent only because such an occurrance could be constructed by hand-editing svk:merge, because AFAIK svk's command-line tools should be able to construct such a circumstance.
- Alex

Networking -- only one letter away from not working

From 4d30e57e5da7c2e880908bc742cf80990d6f9f5d Mon Sep 17 00:00:00 2001
From: Alex Vandiver <[email protected]>
Date: Sun, 29 Nov 2009 02:20:21 -0500
Subject: [PATCH] git-svn: sort svk merge tickets to account for minimal parents

When merging branches based on svk:merge properties, a single merge can have updated or added multiple svk:merge lines. Attempt to include the minimal set of parents by sorting the merge properties in order of revision, highest to lowest.

---
 git-svn.perl |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

index 957d44e..51f03ad 100755
@@ -2940,10 +2940,14 @@ sub find_extra_svk_parents {
 			if ( my $commit = $gs->rev_map_get($rev, $uuid) ) {
 				# wahey!  we found it, but it might be
 				# an old one (!)
-				push @known_parents, $commit;
+				push @known_parents, [ $rev, $commit ];
 			}
 		}
 	}
+	# Ordering matters; highest-numbered commit merge tickets
+	# first, as they may account for later merge ticket additions
+	# or changes.
+	@known_parents = map {$_->[1]} sort {$b->[0] <=> $a->[0]} @known_parents;
 	for my $parent ( @known_parents ) {
 		my @cmd = ('rev-list', $parent, map { "^$_" } @$parents );
 		my ($msg_fh, $ctx) = command_output_pipe(@cmd);

1.6.6.rc0.254.g7352d

Hi Alex, Sam,

I'll defer to Sam for the Ack, my svk knowledge is limited. Thanks.

Eric Wong

Yes, the change does make sense to me - nicely done, Alex.

Sam

Thanks Sam, acked and pushed to git://git.bogomips.org/git-svn

Eric Wong