mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Matthias Urlichs <smurf@smurf.noris.de>
To: linux-kernel@vger.kernel.org
Subject: Re: offtopic: how to break huge patch into smaller independent patches?
Date: Thu, 16 Sep 2004 23:11:48 +0200	[thread overview]
Message-ID: <pan.2004.09.16.21.11.47.825104@smurf.noris.de> (raw)
In-Reply-To: <20040914201210.GE13788@redhat.com>

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

  parent reply	other threads:[~2004-09-16 21:12 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-09-14 19:48 Chris Friesen
2004-09-14 20:11 ` William Lee Irwin III
2004-09-14 20:12 ` Dave Jones
2004-09-14 22:12   ` J. Bruce Fields
2004-09-16 21:11   ` Matthias Urlichs [this message]
2004-09-16 21:21     ` Herbert Poetzl
2004-09-15  0:20 ` Anton Blanchard
2004-09-15  0:47   ` Martin J. Bligh
2004-09-15  1:24     ` Chris Friesen
2004-09-15  1:47       ` Andreas Dilger
2004-09-15  4:36         ` Chris Friesen
2004-09-15  5:27           ` Martin J. Bligh
2004-09-15 11:48             ` Arnd Bergmann
2004-09-15 23:05           ` Andrew Morton

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=pan.2004.09.16.21.11.47.825104@smurf.noris.de \
    --to=smurf@smurf.noris.de \
    --cc=linux-kernel@vger.kernel.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

all inboxes | Powered by JetHome®