Hello, Jay!
> The patch posted yesterday to disable keyword expansion during branch
> merges was (1) premature (2) not well tested and (3) based on a very
> incomplete understanding of the cvs source code. I've since spent more
> time on the code, and the attached patch does seem to behave properly in
> all the cases I've tested.
I appreciate your efforts, but have you run sanity.sh with the patched
CVS? Does it pass both in local on in remote mode?
If it does, can you add a test for the new behaviour, so that the original
version doesn't pass the test?
Regards,
Pavel Roskin
