[cvsnt] Re: Merging with keyword substitution

Tony Hoyle tmh at nodomain.org
Wed Jun 22 12:54:53 BST 2005


Mike Lehmann wrote:
>> If you specify -kk during the merge
> 
> 
> Didn't you wrote some time ago (sorry, cannot find it), that this is not 
> necessary with CVSNT because it should be handled by the CVS server 
> which already should know about this problem? Doesn't -kk corrupts 
> binary files in my project?

It's supposed to be, but not currently in all cases.  For simplicity 
using -kk just makes sure it definately works in this instance.

If there are binaries, -k-v is better.

Tony



More information about the cvsnt mailing list