Re: [spf:guess] Re: Regression: git-svn clone failure
From: Sam Vilain <hidden>
Date: 2016-06-15 22:47:56
On Tue, 2009-12-22 at 11:21 -0800, Eric Wong wrote:
quoted hunk ↗ jump to hunk
That looks like a simple error, does the following patch help?diff --git a/git-svn.perl b/git-svn.perl index 3670960..dba0d12 100755 --- a/git-svn.perl +++ b/git-svn.perl@@ -3163,7 +3163,8 @@ sub find_extra_svn_parents { next unless $new_parents[$i]; next unless $new_parents[$j]; my $revs = command_oneline( - "rev-list", "-1", "$i..$j", + "rev-list", "-1", + "$new_parents[$i]..$new_parents[$j]", );
Yes, that is the intent. Hrm, I'd have thought my test would have stepped over that code when it merged in a branch which merged two an svn branch which included a merge of another svn branch. Obviously not! I'll cook something up to cover that.. Sam.