[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug-patch] Re: BUG? merge don't detect already merged hunk

From: Andreas Gruenbacher
Subject: [bug-patch] Re: BUG? merge don't detect already merged hunk
Date: Wed, 17 Feb 2010 23:07:19 +0100
User-agent: KMail/1.12.2 (Linux/; KDE/4.3.1; x86_64; ; )

On Wednesday 17 February 2010 22:30:03 Bert Wesarg wrote:
> Hi all,
> the merge algorithm does not detect an already merged hunk, if the
> hunk is an append-only diff (i.e. lines adding at the end of he
> original file).

Hmmm ... attached is a patch adding a test case which currently fails; I'll 
have to see how this can be fixed.  The symmetric prepend-only case works as 


Attachment: already-applied.diff
Description: Text Data

reply via email to

[Prev in Thread] Current Thread [Next in Thread]