> I was really hoping somebody would contradict me on this and say,
> "Don't be an idiot, there's an easy way to do it!" Is the truth
> really as bleak as I painted it? Can it really be true that if you
> have binary files and text files in your repository, and there are
> keywords in your text files, there is no single cvs command that will
> merge onto a long-lived branch, avoiding spurious conflicts? (Even
> if you are careful to tag the source of every incremental merge?)
I don't think it is quite that bleak:
(1) Disable keywords. Set -kb for all binary files,
and -kk for all text files.
I don't like doing this, but wanting to reduce build times
motivated me.
(2) Do cvs update -j main-countour1 -j main-countour2
It's a single command, although you do have to keep
track of the contours to merge from - the last merged
point.
