I have submitted a patch that fixes "cvs up -C" when CVS "thinks" that a merge
is needed. It's been submitted to SourceForge under project RCVS. I'm not
exactly sure if the patch'll fix your problem, but it may be worth taking a
look.
Noel
[EMAIL PROTECTED] on 2001.01.12 16:50:09
Please respond to [EMAIL PROTECTED]
To: [EMAIL PROTECTED], [EMAIL PROTECTED]
cc: (bcc: Noel L Yap)
Subject: cvs update -C croaks
I am trying to update my tree to a branch and discard all the current
changes. The command I am using to do this, is:
cvs update -C -r branch-name
However, I am getting errors like this:
cvs server: conflict: common/msg/test/xdr_server.c has been added, but
already exists
C common/msg/test/xdr_server.c
for multiple files. Finally, I get a fatal error:
cvs server: Updating common/tiffsup/src
cvs [server aborted]: cannot open tiff.c for copying: No such file or
directory
Am I doing something wrong or is this a bug? I am using cvs 1.10.8.
--
Stephen Rasku E-mail: [EMAIL PROTECTED]
Senior Software Engineer Web: http://www.tgivan.com/
TGI Technologies http://www.pop-star.net/
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
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 Chase & Co. Incorporated, its
subsidiaries and affiliates.
_______________________________________________
Bug-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/bug-cvs
