From: Matt Mackall <mpm@selenic.com>
To: Neil Brown <neilb@cse.unsw.edu.au>
Cc: linux-kernel@vger.kernel.org
Subject: Re: ANNOUNCE: wiggle - a tools for applying patches with conflicts
Date: Mon, 19 May 2003 23:15:20 -0500 [thread overview]
Message-ID: <20030520041520.GP23380@waste.org> (raw)
In-Reply-To: <16073.40798.305573.92933@notabene.cse.unsw.edu.au>
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
prev parent reply other threads:[~2003-05-20 4:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-05-20 3:22 ANNOUNCE: wiggle - a tools for applying patches with conflicts Neil Brown
2003-05-20 4:15 ` Matt Mackall [this message]
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=20030520041520.GP23380@waste.org \
--to=mpm@selenic.com \
--cc=linux-kernel@vger.kernel.org \
--cc=neilb@cse.unsw.edu.au \
/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