From e9e4c8b7473f6ee21f452c66430a0763681243d7 Mon Sep 17 00:00:00 2001 From: Alex Vandiver 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. Signed-off-by: Alex Vandiver Acked-by: Sam Vilain Acked-by: Eric Wong --- git-svn.perl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/git-svn.perl b/git-svn.perl index 957d44e63..51f03adb9 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -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); -- 2.30.2