I wrote:
>This appears to fail on both version 1.10.8 and 1.11.
>
>When doing a merge:
>
> cvs update -kk -j base-tag -j branch-tag
>
>I was still getting keywords expanded in the files. This caused
>conflicts in numerous files. I have been testing this against a
>static tag instead of the HEAD because the branch that was being
>merged has been manually fixed and checked in:
>
Hmmmm... Looking at the merge from 1.10.8 it appears that all of the
conflicts except for one is valid. There were other changes besides
the version number (adding a space, adding a return, changing keyword
from $Revision$ to $Id$, etc.)
I will test tomorrow with 1.11 and re-verify my findings.
--
Stephen Rasku E-mail: [EMAIL PROTECTED]
Senior Software Engineer Web: http://www.pop-star.net/
TGI Technologies
_______________________________________________
Bug-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/bug-cvs
