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

Oliver Giesen ogware at gmx.net
Fri Oct 1 23:02:18 BST 2004

Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.

> 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
> 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

Hope this helps.

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

More information about the cvsnt mailing list
Download the latest CVSNT, TortosieCVS, WinCVS etc. for Windows 8 etc.
@CVSNT on Twitter   CVSNT on Facebook