Re: incorrect merge result

[Ingolf Steinbach]

Hi, Stefan!

* Heirler Stefan <stefan.heirler@siemens.com> [2002-02-12 10:04]:
> > cvs co -r 1.19 scs/sti/ipif_obj.c
> > modify scs/sti/ipif_obj.c
> > cvs update -A -r 1.22 scs/sti/ipif_obj.c

To simplify the case, please provide a repository file
(say test.c,v) with the following structure:

1.1     corresponds to your 1.19
1.1.2.1 corresponds to the modified 1.19
1.2     corresponds to your 1.22

You may want to "encrypt" the contents (e.g. by replacing
every consonant by the letter 'x').

Please also try to find a minimal example (or at least a
reasonable approximation) which exhibits your problems.

Regards
    Ingolf
-- 

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