Re: [PATCH] multiple changes/fixes

[Herve Eychenne <rv@wallfire.org>]

On Sat, Aug 28, 2004 at 02:50:17AM +0200, Henrik Nordstrom wrote:

> On Sat, 28 Aug 2004, Herve Eychenne wrote:

> >Yes... run indent on the current tree, run indent on the patched tree,
> >and run diff on the two "indented" trees. But... too late: I took one
> >hour to remove the fluff from my patch (sigh).

> Found yet another useful tool for splitting patches with less 
> dependencies: tkdiff

I use it all the time, but I don't really see how it can help to
split patches affecting multiple files efficiently (you're talking
about the merge functionnality, aren't you?), as it works with two
versions of a file at a time, and not a diff file nor 2 trees...

> >I'll post 2 new patches tonight (if my head does not fall heavily on my
> >keyboard til then): one containing the information, the other containing
> >syntaxical or cosmetic changes, and typo fixes.

> Great!

Maybe I've talked a little bit too fast, as the patch modified by hand
doesn't apply anymore, and I cannot get it to apply even when playing
with rediff and recountdiff (from the patchutils).

> And thanks for encouraging me to look for tools doing this job easier. Was 
> more things around than I expected to find.

You're welcome... ;-)

 Herve

-- 
 _
(°=  Hervé Eychenne
//)
v_/_ WallFire project:  http://www.wallfire.org/