Potential cvs update bug..?

[Doucette, Joseph]

Hi,

I'm working with cvs 1.11 as distributed with WinCVS 1.2 on Windows 2000. 

I'm seeing a strange problem when I try to checkout the clean version of
files from a local repository. If I've locally modified a file, and there
have been multiple updates to that file in the repository, cvs attempts to
merge the versions together rather then move the modified file aside and get
the new one.

The command line I use is:

cvs -d :local:n:\cvsroot update -C -d target


If there is only one new revision since my modified file, the modified file
is properly moved out of the way and CVS gets the new version.

A log of CVS activity looks like:

U path/file.c
U path/file2.c
(Locally modified Config.c moved to .#Config.c.1.2)
U path/bootConfig.c
RCS file: M:\cvsroot/path/file.h,v
retrieving revision 1.23
retrieving revision 1.24
Merging differences between 1.23 and 1.24 into file.h
M path/file.h
(Locally modified file3.c moved to .#file3.c.1.2)
U path/file3.c


I've looked at the list of fixes in the newer version of CVS, but none of
them seem to address this problem.

Any ideas..?

Thanks,

        - Joe Doucette