[cvsnt] New merge options for update vs checkout

Jerzy Kaczorowski kaczoroj at hotmail.com
Fri May 21 23:04:25 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.


Tony,

There seem to be a few new options for update command:
 -b Perform -j merge from branch point.
 -m Perform -j merge from last merge point (default).
 -I ign More files to ignore (! to reset).
 -W spec Wrappers specification line.
 -3 Produce 3-way conflicts.
 -S Select between conflicting case sensitive names.
 -t Update using last checkin time.

However these are not available for checkout command.

It would be nice to have that for checkout as well since checkout can be
used to update the sandbox in the similiar way as update (but it behavies
better in regard to defined modules) if used against existing sandbox.

Best Regards,
Jerzy



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