[Top][All Lists]

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

Re: Please help with merge!!!!!

From: Larry Jones
Subject: Re: Please help with merge!!!!!
Date: Sat, 9 Mar 2002 15:41:24 -0500 (EST)

Stephen Leake writes:
> Here's the process:
> 1) Unpack the vendor's version 1.0 distribution twice; one "clean"
>    copy, one I will modify.
> 2) Make my modifications.
> 3) Run 'diff' to get a single diff file showing all my modifications.
> Now, when Vendor version 2.0 comes along:
> 1) Unpack Vendor version 2.0 twice.
> 2) Run 'patch' to apply my version 1.0 changes to version 2.0.
> 3) Make more changes.
> 4) Run 'diff' to make a version 2.0 patch file.
> This process is simpler than CVS when the vendor package is huge and
> my local changes are small - a typical situation.

You must have a strange definition of "simpler".  If you're completely
unfamiliar with CVS's vendor branch support (which it seems you are),
then your process may well be more familiar or easier for you, but it
most definitely isn't simpler.

-Larry Jones

Mom would be a lot more fun if she was a little more gullible. -- Calvin

reply via email to

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