[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Please help with merge!!!!!

From: Stephen Leake
Subject: Re: Please help with merge!!!!!
Date: Sat, 09 Mar 2002 03:57:05 GMT
User-agent: Gnus/5.0808 (Gnus v5.8.8) Emacs/20.6

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

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

reply via email to

[Prev in Thread] Current Thread [Next in Thread]