Merging bug (wrong conflicts)

[Ingolf Steinbach]

Hi,

we have problems with both cvs-1.10.7 and cvs-1.11 regarding
merging of changes at the head of the trunk into a locally
modified copy of a file (which was based on an older revision).
(cvs update -rHEAD foobar.c)

This is NOT releated to keyword expansion!

cvs uses the correct revisions for the merge ("Merging
differences between..." but

 * reports conflicts although there are no conflicts at all
 * creates a merged file containing lines which were
    - deleted on the server
    - not modified locally at all
   (These lines are not marked as conflicts!)

We would definitively like to help debugging this. But
please understand that we cannot post the corresponding
files to the list as they contain copyrighted material.
(If one of the CVS developers wants to have a look at
them, we could send the files to him). Meanwhile we'll
try to construct a small test case.

(Please CC: me if you reply to this message. Thanks.)

Regards
    Ingolf
-- 

Ingolf Steinbach                       Jena-Optronik GmbH
ingolf@jena-optronik.de                 ++49 3641 200-147
PGP: 0x7B3B5661  213C 828E 0C92 16B5  05D0 4D5B A324 EC04