[cvsnt] Re: Issue with -kk keyword substitution

[Tony Hoyle]

Dario Souza wrote:
> Hi,
> First of all, thanks for great product. I've been using cvsnt for 2 years
> now, and its unicode support is what forced me to use it and I am very happy
> about it. ;-)
> 
> I'd like to know if this issue has been solved in current cvsnt release
> 2.5.01.1976:
> 
> WARNING: In versions of CVS prior to 1.12.2, there was a major problem with
> using `-kk' on merges. Namely, `-kk' overrode any default keyword expansion
> mode set in the archive file in the repository. This could, unfortunately
> for some users, cause data corruption in binary files (with a default
> keyword expansion mode set to `-kb'). Therefore, when a repository contained
> binary files, conflicts had to be dealt with manually rather than using
> `-kk' in a merge command. 
> 
> That caused big binary file corruption in my source tree when using cvsnt
> 2.0.8 Jul 24 2003
> 
You can use the -k+ and -k- options.  -k-v would do that.

In a lot of cases you don't need any -k options on merge since there's 
logic to handle it internally.. this doesn't work as well as I'd hoped 
though - it's something I'd like to improve at some point if I can work 
out a way of doing it.

Tony