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.
> David Hauck wrote: > > > I'd seen problems with binary file merges previously if I specified > > -kk in the above line (which worked great for eliminating keyword > > merge conflicts in 2.0.58d). Are you suggesting my new > command should > > be: > > > > cvs -q up -k-v -j V1_0_0 -j V1_0_1 > > > Yes (that command basically means subtract the 'v' from all > files, which > does nothing to a binary file and turns a text file into -kk). Perfect, thanks. > The -k- and -k+ options might be in 2.0.58d.. they're around > the right > time but might have missed that release. OK, I'll keep my fingers crossed ;). -David > Tony > _______________________________________________ > cvsnt mailing list > cvsnt at cvsnt.org http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt cvsnt downloads at march-hare.com https://www.march-hare.com/cvspro/en.asp#downcvs @CVSNT on Twitter CVSNT on Facebook >