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.
Prochazka, Jan wrote: > Hello to all, > I got stuck with merging sandbox that holds both text and binary files. > Moreover the text files do have expandable keywords e.g. $Revision$, $Date$ > etc. > > Let's say my sandbox is HEAD and I need merge changes from "branch1". Well, > command "cvs update -j branch1" executed in my sandbox root should be the > right one. However, after merging is done, EVERY text file with keyword > looks modified for cvs with all consequences (:-(((( I found notice about > -kk usage in cvs manual, and the command "cvs update -kk -j branch1" works > fine for text files, but, unfortunately, it screws binary files. The cvs > manual confirms that : Modified isn't really a problem (they are modified really, since the keyword expansions have changed). You just have to commit the extra revsion. You can use -k-v (which removes the v from -kkv, leaving -kk, but wouldn't affect binaries as they don't have it). Tony