From: Beman Dawes (bdawes_at_[hidden])
Date: 2001-09-25 14:26:44
At 02:09 PM 9/25/2001, Jim.Hyslop wrote:
>Beman Dawes [SMTP:bdawes_at_[hidden]] wrote:
>> Help!
>>
>> I'm trying to merge the thread-initial CVS branch into the main trunk.
>
>OK, after some playing around, I've been able to replicate the error.
>
>Try this sequence:
>
>- Check out the trunk (cvs up -A)
>
>- for each file in error, issue the commands:
> cvs up -p -rthread-initial [filename] > [filename]
> cvs add [filename]
>
>- commit the changes.
Worked like a charm!
The idea of adding a file that was already in the repository just never
occurred to me.
Thank you very much!
--Beman