[cvsnt] Ghost Conflicts

Dan Pupek dpupek at astpcola.com
Thu Nov 3 21:37:11 GMT 2005


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.


I released and rechecked out the entire module and all seems fine now.

Dan Pupek
Software Engineer
Advanced Systems Technology, Inc
dpupek at astpcola.com <mailto:dpupek at astpcola.com> 
(850) 475-4038


-----Original Message-----
From: Bo Berglund [mailto:Bo.Berglund at system3r.se]
Sent: Thursday, November 03, 2005 2:05 AM
To: dpupek at astpcola.com; CVSNT Mailing List
Subject: RE: [cvsnt] Ghost Conflicts


I have experienced a number of strange update problems with various kinds
of 2.5.x.x cvsnt versions in combination with older and newer servers.
So I am not surprised.

What conflict does the update produce? The conflict should be clearly
visible inside the file marked by
>>>>>
text
=====
text
<<<<<

Anyway, I recommend you to update the server to 2.5.03.2134 and also
to ues the same version on your client. Most probably the strangeness
disappears, but if it does not then you should report it to Tony via
the list.

/Bo

-----Original Message-----
From: cvsnt-bounces at cvsnt.org [mailto:cvsnt-bounces at cvsnt.org]On Behalf
Of Dan Pupek
Sent: den 2 november 2005 23:30
To: CVSNT Mailing List
Subject: [cvsnt] Ghost Conflicts


On one directory in my repository I receive ghost conflicts when updating.

If I call "cvs update" it updates fine but if I call "cvs update -d" it
warns me of conflicts in files that have not even changed locally or on the
server.

Here is my version output:
Client: Concurrent Versions System (CVSNT) 2.5.01 (Travis) Build 1927
(client/server)
Server: Concurrent Versions System (CVSNT) 2.5.02 (Servalan) Build 2088
(client/server)

Thanks in advance for any help.

Dan Pupek
Software Engineer
Advanced Systems Technology, Inc
dpupek at astpcola.com
(850) 475-4038


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