Re: Anyone know of a version of patch(1) that can do a cvs-savvy 3-way merge?

[Darin Adler <darin bentspoon com>]

On 2/10/02 4:17 PM, "Tom Tromey" <tromey redhat com> wrote:

> Another approach is simply to `cvs update -rVERSION FILE', then apply
> the patch, then `cvs update -A'.  You could easily write a script to
> automate this; it would extract version numbers from the patch and
> apply `cvs update -r' as appropriate.

Exactly! This is what I'm planning to do if I don't find something that
already exists. Although I wouldn't hard-code "cvs update -A"; I'd check the
current branch beforehand and move back to that branch.

    -- Darin