From: Michael Olson <mwolson@gnu.org>
Date: Tue, 20 Apr 2010 21:30:19 GMT
Subject: [PATCH/RFC 2/2] git-svn: Don't allow missing commit parent to stop git-svn
Message-ID: <j2wc8b3bef91004201430ie371be83kee0e3e4c35ab9c9e@mail.gmail.com>

Instead, fall back to assuming that the incoming merge is a bunch of
cherry-picks and ignore it.

Signed-off-by: Michael W. Olson <mwolson@gnu.org>
---
 git-svn.perl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/git-svn.perl b/git-svn.perl
index 0e1feb3..1a53709 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -3110,7 +3110,7 @@ sub check_cherry_pick {
 	my %commits = map { $_ => 1 }
 		_rev_list("--no-merges", $tip, "--not", $base);
 	for my $range ( @ranges ) {
-		delete @commits{_rev_list($range)};
+		eval { delete @commits{_rev_list($range)} };
 	}
 	for my $commit (keys %commits) {
 		if (has_no_changes($commit)) {
-- 
1.7.1.rc0