cvs update -A who knows?

[weiquanyuan]

i know this command would reset any sticky tag and date, that means the file will be update by HEAD revision.
since I did some testing on one file, i find that
CVS update -A xyz.file
CVS update -rHEAD xyz.file
both do the same thing?
Am I right?
but tutorial says " The '-A' option merges local changes into the version of the file from the head of the trunk." It seems like it never remember the local change, just grab HEAD version and that's it.

 

[ClayG]

Seems reasonable that when you merge an earlier version and a later one, you basically end up with the later one as the result, if there are no branches involved. It probably would be different if, say, the non-Head version was a branch that contained changes not in the Head.