On Tue, May 11, 2010 at 21:44, Paul Lindner <lindner@xxxxxxxxx> wrote:
> This fixed it for my situation. Thanks!
>
> On May 11, 2010, at 9:20 AM, Bert Wesarg wrote:
>
>>
>> Can you try this patch, it worked on my site:
>>
>> diff --git a/git-svn.perl b/git-svn.perl
>> index b3b6964..40ecec0 100755
>> --- a/git-svn.perl
>> +++ b/git-svn.perl
>> @@ -3103,7 +3095,11 @@ sub check_cherry_pick {
>> my %commits = map { $_ => 1 }
>> _rev_list("--no-merges", $tip, "--not", $base);
>> for my $range ( @ranges ) {
>> - delete @commits{_rev_list($range)};
>> + if ( $range =~ /^([[:xdigit:]]{40})\^\.\.([[:xdigit:]]{40})$/i ) {
>> + delete @commits{_rev_list(sprintf("%s^!", $1), $2)};
>> + } else {
>> + delete @commits{_rev_list($range)};
>> + }
>> }
>> for my $commit (keys %commits) {
>> if (has_no_changes($commit)) {
Eric, have you picked this up, or should I re-send it as a propper patch?
Bert
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html