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 c
TED] 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 upda
I should have included a subject on this.
>
>That patch
>(http://sourceforge.net/patch/?func=detailpatch&patch_id=100589&group
_
>id=4680) seems to have fixed the problem. Has it been checked into
>the Repository (i.e. will this fix be in 1.11.1?)?
>
--
Stephen Rasku E-mail
