To: linux-kernel@vger.kernel.org
Path: not-for-mail
From: Matthias Urlichs <smurf@smurf.noris.de>
Newsgroups: smurf.list.linux.kernel
Subject: Re: offtopic: how to break huge patch into smaller independent patches?
Date: Thu, 16 Sep 2004 23:11:48 +0200
Organization: {M:U} IT Consulting
Message-ID: <pan.2004.09.16.21.11.47.825104@smurf.noris.de>
References: <41474B15.8040302@nortelnetworks.com> <20040914201210.GE13788@redhat.com>
NNTP-Posting-Host: kiste.smurf.noris.de
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7BIT
NNTP-Posting-Date: Thu, 16 Sep 2004 21:11:48 +0000 (UTC)
User-Agent: Pan/0.14.2.91 (As She Crawled Across the Table)
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1056
Lines: 24

Hi, Dave Jones wrote:

> diffsplit will split it into a patch-per-file, which could be
> a good start. If you have multiple changes touching the same file
> however, things get a bit more fun, and you get to spend a lot
> of time in your favorite text editor glueing bits together.

You can rip the bits apart instead, and leave the glueing and rip-patching
to the computer.

- edit patch file:
  - delete all the parts you don't want applied; freely hand-edit stuff,
    and don't worry about the pesky line numbers
  - save to new patch file
- run "rediff" to fix up the new file
- run "interdiff" to create a second, clean patch file
  containing just the deleted parts
- iterate until finished

All of this is part of the nice patchutils package.

NB: if all else fails, use espdiff(1).
-- 
Matthias Urlichs
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/