Bug 119693 - gendiff "-U0 with ChangeLog" feature messes up when latest entry has same header
gendiff "-U0 with ChangeLog" feature messes up when latest entry has same header
Status: CLOSED NOTABUG
Product: Red Hat Raw Hide
Classification: Retired
Component: rpm (Show other bugs)
1.0
All Linux
medium Severity medium
: ---
: ---
Assigned To: Jeff Johnson
Mike McLean
:
Depends On:
Blocks:
  Show dependency treegraph
 
Reported: 2004-04-01 10:39 EST by Mark McLoughlin
Modified: 2007-04-18 13:05 EDT (History)
0 users

See Also:
Fixed In Version:
Doc Type: Bug Fix
Doc Text:
Story Points: ---
Clone Of:
Environment:
Last Closed: 2004-04-02 07:48:41 EST
Type: ---
Regression: ---
Mount Type: ---
Documentation: ---
CRM:
Verified Versions:
Category: ---
oVirt Team: ---
RHEL 7.3 requirements from Atomic Host:
Cloudforms Team: ---


Attachments (Terms of Use)

  None (edit)
Description Mark McLoughlin 2004-04-01 10:39:55 EST
gendiff strips out the context of patches to ChangeLog which is
a really sweet feature which makes sure the patch always applies
cleanly to the top of the Changelog.

However, it breaks down if the diff is against a ChangeLog where
the most recent entry has the same header as the one in the diff
and you end up with something like

+     * foo.c: fix
+
+2004-04-01  Mark McLoughlin  <mark@skynet.ie>
+

I know that is the correct output for diff -U0, but it'd be cool
if we could detect this situation and reverse it to

+2004-04-01  Mark McLoughlin  <mark@skynet.ie>
+
+     * foo.c: fix
+
Comment 1 Mark McLoughlin 2004-04-01 10:43:45 EST
Oh, gendiff is in rpm, not patchutils ...
Comment 2 Jeff Johnson 2004-04-02 07:48:41 EST
"Patches cheerfully accepted." is my motto.

Note You need to log in before you can comment on or make changes to this bug.