[EMAIL PROTECTED] on 2000.07.20 17:01:01
>On Thu, Jul 20, 2000 at 03:45:45PM -0400, Noel L Yap wrote:
>> Maybe I need to go over why I want to do this. At some point in the past, I
>> gave out some of our source code. The developer has made some changes to
that
>> source code. I now want to integrate those changes.
>>
>> The easiest way I can think of is:
>> cvs up -r 1.1 file
>> vi CVS/Entries # manually remove sticky tag
>
>There's a MUCH easier way. Use a branch.
>
>Assuming you tagged the version this other developer used:
>cvs tag -b -r TAG TAG_branch
>cvs up -r TAG_branch
>[overlay his changes]
>cvs commit -m "Joe's changes"
>cvs up -A
>cvs up -j TAG -j TAG_branch
>cvs commit -m "integrated Joe's changes"
How is this MUCH easier??? What I gave has two steps (per file) and assumes
nothing. IMO, it'd be much easier to patch "cvs up -r <rev> -A" and "cvs up -D
<date> -A" than to do what you suggest.
Noel
This communication is for informational purposes only. It is not intended as
an offer or solicitation for the purchase or sale of any financial instrument
or as an official confirmation of any transaction. All market prices, data
and other information are not warranted as to completeness or accuracy and
are subject to change without notice. Any comments or statements made herein
do not necessarily reflect those of J.P. Morgan & Co. Incorporated, its
subsidiaries and affiliates.
