[cvsnt] Diff and Merge Error Using 1.11.1.3

[Jefferson, Anthony]

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.

>Tony

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
(wincvs,jcvs,cvs.exe).
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