From: Eric Blake <eblake@redhat.com>
Date: Tue, 16 Aug 2011 23:10:44 GMT
Subject: Re: [bug-patch] rejecting patches that have an offset
Message-ID: <4E4AF8F4.60709@redhat.com>
In-Reply-To: <1313534889.5598.21.camel@schurl.linbit>

On 08/16/2011 04:48 PM, Andreas Gruenbacher wrote:
> Eric,
>
> On Mon, 2011-08-15 at 17:16 -0600, Eric Blake wrote:
>> It would have saved me a lot of time if both 'patch' and 'git apply'
>> could be taught a mode of operation where they explicitly reject a patch
>> that cannot be applied without relying on an offset.
>
> that sounds reasonable.  Can you send a patch or at least add a bug on
> Savannah?

Bug opened: https://savannah.gnu.org/bugs/index.php?34031

>
>> It might also be nice if patch could learn the algorithm that appears to
>> match the git behavior, where when there are multiple points with
>> identical context (viewing just the context in isolation), but where
>> those locations differ in function location (as learned by the @@ header
>> line in the patch file), then the preferred offset is the one in the
>> named function, even if that is not the closes context match to the line
>> number given in the patch file.
>
> Sounds interesting; a patch for that would be great as well.

Bug opened: https://savannah.gnu.org/bugs/index.php?34032

-- 
Eric Blake   eblake@redhat.com    +1-801-349-2682
Libvirt virtualization library http://libvirt.org