From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16275 invoked by alias); 23 Oct 2006 22:26:53 -0000 Received: (qmail 16261 invoked by uid 22791); 23 Oct 2006 22:26:53 -0000 X-Spam-Status: No, hits=-1.2 required=5.0 tests=AWL,BAYES_00,SPF_PASS X-Spam-Check-By: sourceware.org Received: from mail.ie.commprove.com (HELO mail.ie.commprove.com) (80.169.138.185) by sourceware.org (qpsmtpd/0.31) with ESMTP; Mon, 23 Oct 2006 22:26:48 +0000 Received: from mail.ie.commprove.com (localhost [127.0.0.1]) by mail.ie.commprove.com (Commprove Mail Server) with ESMTP id 496D91496 for ; Mon, 23 Oct 2006 23:26:33 +0100 (IST) Received: from 10.6.7.70 (SquirrelMail authenticated user eli_carter) by mail.ie.commprove.com with HTTP; Mon, 23 Oct 2006 17:26:33 -0500 (CDT) Message-ID: <53689.10.6.7.70.1161642393.squirrel@mail.ie.commprove.com> Date: Mon, 23 Oct 2006 22:26:00 -0000 Subject: patch subtraction bug From: "Eli Carter" To: patchutils-list@sourceware.org User-Agent: SquirrelMail/1.4.4 MIME-Version: 1.0 Content-Type: text/plain;charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Priority: 3 (Normal) Importance: Normal X-CommProve-MailScanner: Found to be clean X-CommProve-MailScanner-From: eli.carter@commprove.com X-IsSubscribed: yes Mailing-List: contact patchutils-list-help@sourceware.org; run by ezmlm Precedence: bulk List-Subscribe: List-Post: List-Help: , Sender: patchutils-list-owner@sourceware.org X-SW-Source: 2006-q4/txt/msg00000.txt.bz2 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