GNU bug report logs - #72556
29.1.90; vc-diff does not undo hunk in end of source file

Previous Next

Full log

Message #35 received at 72556 <at> debbugs.gnu.org (full text, mbox):

From: Tomas Nordin <tomasn <at> posteo.net>
To: Juri Linkov <juri <at> linkov.net>, Eli Zaretskii <eliz <at> gnu.org>
Cc: Dmitry Gutov <dmitry <at> gutov.dev>, 72556 <at> debbugs.gnu.org
Subject: Re: bug#72556: 29.1.90; vc-diff does not undo hunk in end of source
 file
Date: Sat, 01 Mar 2025 21:21:39 +0000

[Message part 1 (text/plain, inline)]

Tomas Nordin <tomasn <at> posteo.net> writes:

[...]

> NEW: if non-nil, hunk is already applied
> OLD: if non-nil, hunk is not applied

Those notes might be correct for the normal case but when REVERSE is
non-nil, the notion of NEW and OLD is reversed.

[...]

So I added a check to only satisfy the NEW *and* OLD case when REVERSE is
not given.  What do you think?  (Also aligned the leading whitespace
with original code).  In my manual tests it seems to work.  I learned
about the splitting of hunks and it doesn't seem broken.

[0001-Fix-detection-of-hunk-already-applied.patch (text/x-diff, attachment)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.