[cvsnt] Diff and Merge Error Using

Bo Berglund Bo.Berglund at system3r.se
Fri Jan 10 15:02:00 GMT 2003

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.

"Does anyone else use CVSNT as a server?"
Are you kidding? There are tons of outfits out there doing precisely this...
We have been using CVSNT for 2 years now and have not had any problems whatsoever
in this area. The only inconveniences we have sen are that sometimes a cvs.exe
process is hung on the server for some unknown reason. THis is not noted by the
users until they try to commit a new revision of the file this cvs.exe process
was operating on at the time of failure. THis file is now locked and cannot be
updated on the server.
This happens very seldom and is cured in our case by having a nightly cleanup
task that runs at 04:00 and kills all cvs.exe that lives at this time.

We run on Windows 2000 server (not a PDC), which is dedicated to CVS usage.
On this we also run IIS5 in order to serve out web acces via CVSWeb. This has
sometimes failed to authenticate the users but then we apply the Microsoft
trick (restart IIS) and it goes away. Does not affect CVSNT one bit though,
this is Microsoft software acting up.

We have clearly more problem with other software than CVSNT.


-----Original Message-----
From: Jefferson, Anthony [mailto:Anthony.Jefferson at gd-ais.com]
Sent: den 10 januari 2003 15:53
To: 'cvsnt at cvsnt.org cvsnt downloads at march-hare.com @CVSNT on Twitter CVSNT on Facebook'
Subject: Re: [cvsnt] Diff and Merge Error Using

Tony Hoyle replied:
>Jefferson, Anthony wrote:

>> retrieving revision 1.6
>> retrieving revision 1.7
> Merging differences between 1.6 and 1.7 into build.xml
>> build.xml already contains the differences between 1.6 and 1.7
>That's your answer. Your local version 1.6 already contains the changes
>made to go from 1.6->1.7, so there's nothing to do.


Unfortunately, the changes are not in my local file. The server reports this
but it is simply not true. If I were to commit my local version I would
overwrite changes to 1.7. 
Upon further research I discovered that when I use cvs.exe with a local
repository everything works correctly. The update feature merges the two
version fine. However, when I use the pserver version I get the error
previously described. This behavior is seen using every client I've tested
We are now using a Linux version of CVS until we figure out why CVSNT does
not behave as expected. Does anyone else use CVSNT as a server? If so, are
they experiencing any merge difficulties? As we would prefer to use our
Windows 2000 machine for archiving, any help would be appreciated.
Sorry for putting this back at the top of the news chain but our connection
to news is busted and I was forced to use email.

Anthony Jefferson

cvsnt mailing list
cvsnt at cvsnt.org cvsnt downloads at march-hare.com @CVSNT on Twitter CVSNT on Facebook
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