"John R. Dunning" wrote:
>
> In previous lives, I used cvs, branches, and expandable keywords, and
> don't ever recall having this problem. So, questions for the
> assembled experts:
>
> 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?
>
Personally, I consider branch-to-branch merges as too tricky to leave
to the individual developer, so I wrote Perl scripts to do the dirty
work (of which the -kkv I use is one of them). These scripts prevent
several potential mistakes (like wiping out branch tags) and so I
try to get people to use them. That way, they come to me less often
with questions on "How do we fix things now that I did X?"
(The biggest single problem I get is when people type
cvs tag -F RELEASE_x_y
rather than
cvs tag -F RELEASE_x_y_MERGED
where the first is the branch tag and the second is the marker showing
which changes have been merged to head. Eliminating that was worth
the time taken to write and verify the Perl stuff.)
--
David H. Thornley Software Engineer
at CES International, Inc.: [EMAIL PROTECTED] or (763)-694-2556
at home: (612)-623-0552 or [EMAIL PROTECTED] or
http://www.visi.com/~thornley/david/
