RCS Keyword Conflicts During Merge (was RE: [cvsnt] Re: minor Bug inupdate in Build 1927)

Richard Wirth r.wirth at wirthware.de
Wed Apr 6 18:21:40 BST 2005


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.


Hello Matt,

Wednesday, April 6, 2005, 7:08:35 PM, you wrote:

MS> It that they way to ignore keywords when doing diffs and merges  was to use
MS> the -kk option to prevent keywords from being expanded.

MS> It's worked in all cases for me so far.

As I stated before -- it happend on a regular update not merge!
And for update the use of -kk does complete different thinks than for
merge.

-- 
Best regards,
 Richard                            mailto:r.wirth at wirthware.de




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