[cvsnt] Re: merge and keyword expansion trouble

[Prochazka, Jan]

Tony, thanks a lot ! "-k-v" is great. It did solve a lot of issues.

Few files, that cvsnt considers modified, still hangs there and I have no
idea why. All 3 files looks exactly the same the one in sandbox before
merge, in repository that was merged to sandbox and the merged file in
sandbox. Keep investigating. Any suggestions, hints and cvsnt merging
insight are constantly highly welcomed.

Great weekend to all,
Jan


> -----Original Message-----
> From: Tony Hoyle [mailto:tmh at nodomain.org]
> Sent: Tuesday, October 26, 2004 12:34 PM
> To: cvsnt at cvsnt.org
> Subject: [cvsnt] Re: merge and keyword expansion trouble
> 
> 
> 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
> _______________________________________________
> cvsnt mailing list
> cvsnt at cvsnt.org
> http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt
>