Re: Please help with merge!!!!!

[Stephen Leake]

Andy Mayer <address@hidden> writes:

> Hi,
> 
> Problem: I want to merge the vendor's new release (R2) with my
> customisations to the previous release (R1).
> 
> <snip>
> How do I make CVS keep my original changes to R1, but take the vendor's
> new changes to R2?

I don't think CVS can do that. You are talking about managing "change
sets". 

I handle this process by keeping a diff file of my changes to vendor's
code, and applying it to each new release (outside of CVS).

-- 
-- Stephe