I've just tripped over the branches-vs-keyword expansion "feature", so
concisely described on page 193 or Fogel, "Open Source Development
with CVS". [If you don't have the book in front of you, this is the
problem where if you have branches, and use keywords such as $Id$, and
then try to merge from one branch to another, you get spurious merge
conflicts, due to the keyword having expanded in incompatible ways on
the two branches]
In previous lives, I used cvs, branches, and expandable keywords, and
don't ever recall having this problem. So, questions for the
assembled experts:
1. Is this unfortunate behaviour new in modern (post 1.9) versions of
cvs? Or perhaps I'm hallucinating, and it's been a problem all
along?
2. Is there any thought of fixing it in future revs? Does anyone
have a patch to fix it?
3. Is there any other workaround other than jamming the equivalent of
-kk onto the command line, or putting it in the admin files or
something?
Thanks in advance for any input...
