[cvsnt] File Conflict Problems

Theo Harper theo_harper at hotmail.com
Sat Aug 24 18:11:58 BST 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.

We are using WinCVS on our project and have started having a problem over
the last few week that if a conflict is detected when doing an update the
file is not highlighted as conflicting.
Make a change in a file, say build.xml in checkout directory # 1, and
checkin. Make a conflicting change in another checkout directory.
Perform an update on the second file:
cvs update build.xml (in directory H:\EvoDev\evobuild\)
RCS file: f:/wincvs/repository/EvoDev/evobuild/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
Merging differences between 1.3 and 1.4 into build.xml
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in build.xml
C build.xml
*****CVS exited normally with code 0*****
However, the file is NOT highlighted with a C and cvs status returns:
cvs status -v build.xml (in directory H:\EvoDev\evobuild\)
File: build.xml Status: Locally Modified
Working revision: 1.4
Repository revision: 1.4 f:/wincvs/repository/EvoDev/evobuild/build.xml,v
Sticky Tag: (none)
Sticky Date: (none)
Sticky Options: (none)
Existing Tags:
fri-09-aug (revision: 1.2)
iteration-1-patches (branch: 1.1.2)
iteration-1 (revision: 1.1)
*****CVS exited normally with code 0*****
Looking at CVS/Entries:
/build.xml/1.4/Result of merge//
Version info as follows:
WinCvs 1.3b8
Client: Concurrent Versions System (CVSNT) (Build 57g)
Server: Concurrent Versions System (CVSNT) (Build 57f)
Any ideas?
Conflicting versions maybe?

This e-mail and any files transmitted with it are confidential and intended
solely for the use of the individual or entity to whom it is addressed. If
you have received this e-mail in error you must not copy, distribute or take
any action in reliance on it. Please notify the sender by e-mail or
telephone. We utilise an anti-virus system and therefore any files sent via
e-mail will have been checked for known viruses. You are however advised to
run your own virus check before opening any attachments received as we will
not in any event accept any liability whatsoever once an e-mail and/or any
attachment is received. Any views expressed by an individual within this
e-mail do not necessarily reflect the views of Systems Union Group plc or
any of its subsidiary companies.

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