RE: cvs up -C bug(s)

[Cameron, Steve]

Noel yap wrote:
> "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 
        [smc]  or the tip of the branch if the revision in your sandbox 
        has a sticky branch tag, of course.  [...]