Re: ANNOUNCE: wiggle - a tools for applying patches with conflicts

From: Matt Mackall (mpm@selenic.com)
Date: Mon May 19 2003 - 23:15:20 EST

Next message: Miles Bader: "Re: Recent changes to sysctl.h breaks glibc"
Previous message: H. Peter Anvin: "Re: Recent changes to sysctl.h breaks glibc"
In reply to: Neil Brown: "ANNOUNCE: wiggle - a tools for applying patches with conflicts"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

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/

Next message: Miles Bader: "Re: Recent changes to sysctl.h breaks glibc"
Previous message: H. Peter Anvin: "Re: Recent changes to sysctl.h breaks glibc"
In reply to: Neil Brown: "ANNOUNCE: wiggle - a tools for applying patches with conflicts"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

This archive was generated by hypermail 2b29 : Fri May 23 2003 - 22:00:39 EST