Merging in CVS

[John Dennis]

On Thu, 2005-06-09 at 20:44 +0200, Ralf Ertzinger wrote:
> For the record, I ended up doing the following:
> 
> cd <package-root>
> cd FC-4
> # A and B are the revisions I want to merge
> (cd ../devel && cvs diff -uN -r A -r B) | patch --dry-run
> # Check output
> (cd ../devel && cvs diff -uN -r A -r B) | patch

Easy solution for a select subset of cases. But be aware it won't handle
new or obsolete files and it will nuke important parts of the spec file
that need to be preserved.
-- 
John Dennis <jdennis at redhat.com>