diff options
| -rwxr-xr-x | git-svn.perl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/git-svn.perl b/git-svn.perl index 957d44e630..51f03adb9b 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); |