Merging in CVS

[Ralf Ertzinger]

Hi.

Jeff Pitman <symbiont at berlios.de> wrote:

> Sounds to me that the complexity of avoiding %if exceptions is about
> the same as embracing it.  There's definitely a balance to be had; but,
> an all out dismissal of the idea will just shift the complexity of
> dealing with this to another space.  Spec files will be clean though! :P

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

-- 
"Life is like an analogy."  -- Aaron Allston