Re: Modifying 3rd Party Code

[Larry Jones]

Robert Longworth writes:
> 
> 1 conflicts created by this import.
> Use the following command to help the merge:
> 
>       cvs checkout -jVEND:yesterday -jVEND testapp

The suggested command assumes you won't import more than one vendor
release per day, which you have.  It is much safer to use the release
tags instead (CVS doesn't have any way to know what they are, which is
why it can't suggest them), and that will avoid this problem:

        cvs checkout -jR1_0 -jR1_2 testapp

-Larry Jones

The surgeon general should issue a warning about playing with girls. -- Calvin