FW: [cvsnt] Re: Regresssion and branches in the current sand box?

[Oliver Giesen]

> Apparently, if you want to merge or override changes immediately, one can
> use the update command. It seems that both the -j and the -r for the
update
> command want to merge changes all the time.

Update -r will only perform a merge if your files are locally modified.
Apart from that, the distinction is as simple as:

up -j     ~ merge local with specified revision
up -j -j  ~ merge local with delta between specified revisions
up -r     ~ get specified revision
             (if files are locally modified, merge local with specified
revision)

Hope this helps.

-- 
Oliver
----  ------------------
JID:  ogiesen at jabber.org
ICQ:  18777742     (http://wwp.icq.com/18777742)