Re: Merging bug (wrong conflicts)

[Ingolf Steinbach]

To illustrate the problem, please use the attached bug,v.gz
file in the repository and

    cvs update -A bug

after that. Look at the changes made in the "external"
branch:

    cvs diff -r 1.1 -r 1.1.2.1 bug

(Note e.g. the last two changes: two blocks are deleted.)

Look at the changes between 1.1 and 1.2:

    cvs diff -r 1.1 -r 1.2 bug

(The part changed in the "external" branch is not affected
 by these differences.)

Try to merge the changes from the external branch into the
main line:

    cvs update -j external bug

CVS reports a conflict for a line which was only changed in
the external branch. The deleted blocks (see above) are
still there.

(Thanks, Cameron, for the "sed"-tip.)

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

bug,v.gz
Description: gzip'ed repository file