I just had a weird problem crop up.
We have a file. At rev 1.8 we split off a release branch, and merged
all changes in (so that diffing on 1.8.2.1 vs. 1.9 and 1.8.2.2 vs.
1.10 pick up only the keyword changes).
One user made a large change to 1.8.2.2, and checked it in as 1.8.2.3.
He then tried merging it to head branch, and was told there were
three conflicts.
As far as I can figure, CVS looks at 1.8.2.2 and 1.8.2.3, and tries
to apply the change to 1.10; despite the fact that 1.10 and 1.8.2.2
are identical (using the -kk flag to suppress keyword expansion),
it can't figure out how to apply the change.
(I suppose the workaround is to do a physical copy, since we do
want it 1.8.2.3 and 1.11 to be identical.)
I've never seen a problem like this before. I checked out the latest
CVS source and looked in README/BUGS/NEWS/ChangeLog, and found nothing
applicable.
Does anybody have any ideas?
--
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/
