>In my opinion the -kk option shouldn't override the
>-kb option.
>
>Wilfried
>
I agree. It's a shame that keywords and merging don't get along and that
the binary designation has been overloaded with keyword expansion state.
I'd like to see a new -kkb option, perhaps, which disables keyword expansion
only for non-binary files. I've looked briefly through the CVS code, and
(perhaps in my naivte) appears to be a fairly straightforward addition.
In Karl Fogel's book, he recommends that if you have any binary files, you
should NOTuse -kk to avoid possible corruption in binary files - and just
deal with the conflicts. That's certainly the safest approach - I'd like to
see work towards a more efficient approach, though.
David
