Messages in this thread |  | | Date | Mon, 19 May 2003 23:15:20 -0500 | From | Matt Mackall <> | Subject | Re: 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 : http://www.selenic.com : of or relating to the moon - 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/
|  |