[Cvsnt] conflict error

Mirko Viviani mviviani at decinf.it
Tue Jan 22 10:59:25 GMT 2002

Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.

Jane Fothergill wrote:

> cvs update: conflict: common.asp is modified but no longer in the repository
> right, it was there,  somehow I'd put a sticky tag on it which I hadn't
> meant.  So, I deleted the tag using:

With cvs NT (Build 41) I've got the same thing after updating a
modified file in a branch.


% cvs update -r mybranch
% modify aFileName
% cvs update aFileName
cvs server updating.
cvs server: conflic: aFileName is modified but no longer in the repository
C aFileName

I've reverted to 1.10.8 and all worked again...

Why ?



Cvsnt mailing list
Cvsnt at cvsnt.org
http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt https://www.march-hare.com/cvspro/en.asp#downcvs

More information about the cvsnt mailing list
Download the latest CVSNT, TortosieCVS, WinCVS etc. for Windows 8 etc.
@CVSNT on Twitter   CVSNT on Facebook