From: "Eli Carter" <eli.carter@commprove.com>
To: patchutils-list@sourceware.org
Subject: patch subtraction bug
Date: Mon, 23 Oct 2006 22:26:00 -0000 [thread overview]
Message-ID: <53689.10.6.7.70.1161642393.squirrel@mail.ie.commprove.com> (raw)
I tried abusing patchutils in a new way today, and it didn't do what I
wanted.
First, pull one change out of a larger patch:
filterdiff -p1 -i some/file.py --hunks=5 < diff > one-change.patch
Now, I want to remove that change from the larger patch, so I combine the
larger patch with a reversed version of the the one-change.patch:
interdiff one-change.patch /dev/null | combinediff diff /dev/stdin >
rest.patch
What I got was a patch with the hunk from one-change.patch in rest.patch
twice with different line numbers for the change.
When I tried the same abuse, but filtering only on file (no --hunks=),
combinediff removed that file's deltas from the original diff, just as I
hoped it would.
So it looks to me like combinediff isn't accounting for the change in line
numbers for a file due to one patch that affects the target line numbers
in the other patch.
If I have a chance, I'll look at the code and try to make this work, but
it'll be another day.
Have fun,
Eli
eli.carter@commprove.com
next reply other threads:[~2006-10-23 22:26 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-23 22:26 Eli Carter [this message]
2006-10-24 11:08 ` Tim Waugh
2006-10-24 14:37 ` Eli Carter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=53689.10.6.7.70.1161642393.squirrel@mail.ie.commprove.com \
--to=eli.carter@commprove.com \
--cc=patchutils-list@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).