Re: [bug-patch] two different hunks erroneously get applied to the very same spot

[Andreas Grünbacher]

2017-09-04 18:04 GMT+02:00 Benno Schulenberg <address@hidden>:
>
> Andreas,
>
> Op  4-09-2017 om 14:15 schreef Andreas Grünbacher:
>>
>> I'm getting the following result with current patch, which differs
>> from what you are getting:
>>
>> $ patch -i goes-wrong.patch -o testor.c.out testor.c
>> patching file testor.c.out (read from testor.c)
>> Hunk #1 succeeded at 7 with fuzz 1.
>> Hunk #2 succeeded at 56 with fuzz 2 (offset 8 lines).
>
>
> That is what I get when I apply the patch a second time.  I'm pretty
> sure your testor.c file has already been patched/modified -- because
> if not, and the first hunk applies with fuzz 1, the second one should
> apply with no fuzz and offset 0 lines.  The offset of 8 lines means
> that already two hunks of 4 lines have been inserted.
>
> The original testor.c has this:
> $ wc testor.c
>   95  388 2719 testor.c

Not in my testing:

$ wc testor.c
 103  415 2983 testor.c
$ file testor.c
testor.c: ASCII text, with CRLF line terminators

Andreas