Branches vs keyword expansion

2000-07-19 Thread John R. Dunning 

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...

In search of merge scripts

2000-10-30 Thread John R. Dunning 

A bunch of the hackers at my company are agitating for some better
tools for managing the process of merging groups of changes from one
branch to another.  I've seen references on this list to scripts
(shell, perl, or something) to aid (I don't want to say automate) the
process of merging, when you've got, say, a mainline (devo) branch and
a sustaining-engineering (release) branch.

Any input appreciated.  Thanks in advance.


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Is it possible to change a branch tag name?

2000-12-06 Thread John R. Dunning 

One of the folks in my group has decided he wants to change the name
of a branch tag, after having done some amount of changing of files on
that branch.  I'd never heard of a way to do that, and a scan of the
docs doesn't reveal anything that looks like a facility for doing
that, but I figured it was worth asking the list:  Is there a way to
change the name of an existing branch tag?

Thanks in advance...


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs