[Dxspider-support] CVS UPDATE

Dirk Koopman djk at tobit.co.uk
Sat Mar 11 16:33:52 GMT 2006


On Sat, 2006-03-11 at 13:52 +0000, Klaus Heintzenberg wrote:
> Hi!
> 
> Ran into problems after an cvs update a few minutes ago.
> Glad I first tried on the test machine.
> 
> Previous version 1.52 (build 61.495) ran Ok
> 
> During cvs -z3 update d I noticed:
> 
> RCS file: /cvsroot/dxspider/spider/perl/Messages,v
> retrieving revision 1.150
> retrieving revision 1.151
> Merging differences between 1.150 and 1.151 into Messages
> rcsmerge: warning: conflicts during merge
> cvs update: conflicts found in perl/Messages
> C perl/Messages
> 

FAQ: what do I do when I cvs update and I see a letter 'C' (or a letter
'M') in front of the file(s).

Answer: remove the file and do the cvs update again.

Dirk




More information about the Dxspider-support mailing list