Strange CVS behaviour

[Thorsten Alteholz]

Hi,

I just upgraded from cvs server version 1.11.11 to 1.11.21 and now have a
strange cvs behaviour:
- checkout file
- modify file
- cvs update -C file
-> everything is ok, I get the latest version

- checkout file
- modify file
- cvs update file   makes conflict as somebody else changed the same part
- cvs update -C file
-> file is moved to .#file.version , but file (which contains the conflict
markers >>>>> and <<<<<) is not replaced by clean version from repository

So update -C does work unless there was a conflict detected before. This
is independent of the client (at least CVS 1.11.1p1 and CVSNT 2.0.5 show
this behaviour). Is this a bug or a feature or did I do something wrong?
Any help is greatly appreciated.

  Thorsten