[lkml]   [2003]   [May]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: ANNOUNCE: wiggle - a tools for applying patches with conflicts
On Tue, May 20, 2003 at 01:22:06PM +1000, Neil Brown wrote:
> I am pleased to announce the first public release of 'wiggle'.
> Wiggle is a program for applying patches that 'patch' cannot
> apply due to conflicting changes in the original.
> Wiggle will always apply all changes in the patch to the original.
> If it cannot find a way to cleanly apply a patch, it inserts it
> in the original in a manner similar to 'merge', and report an
> unresolvable conflict. Such a conflict will look like:

Very clever. An option to generate traditional .rej files rather than
inline conflicts would be nice; I hate the latter.

Matt Mackall : : of or relating to the moon
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to
More majordomo info at
Please read the FAQ at

 \ /
  Last update: 2005-03-22 13:35    [W:0.048 / U:0.060 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site