cvs up -C bug(s)

[Noel L Yap]

"cvs up -C file" doesn't work correctly if "file" has been modified both in the
repo and the working directory (ie a merge is "needed").  IMO, you should wind
up with a clean repo copy (ie no merge).  The default repo copy should be the
HEAD (for consistency -- does anyone know of an easy way to specify the base
rev?).  There's also a problem with sticky tags when specifying "-r" with it
(specifying "-A" on the same command line doesn't seem to help).

Noel