"Noel L Yap" <[EMAIL PROTECTED]> writes:
> "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).
Your understanding of its intended behavior is correct -- in fact, the
whole point of this option is to discard local changes. But I'm not
able to reproduce the problem -- when I modify a formerly unmodified
file, and then do
cvs update -C <file>
I get the clean repository copy back, exactly as it's supposed to
work. This happens both locally and client server. It is also
what the sanity.sh test case for update -C tests.
Are you running client/server, and if so does your server, as well as
the client, know about the update -C option? If yes, then can you
send a detailed reproduction recipe to [EMAIL PROTECTED]?
Thanks,
-Karl
