Re: Merging bug (wrong conflicts)

[Derek R. Price]

Jacob Burckhardt wrote:

> I have 8 test cases in which either cvs 1.11 or diff3 merges incorrectly.
> Seven of these cases were mailed by various people to the cvs mailing
> lists, and the 8th case was discovered by my co-worker but I have not
> reported it yet.
>
> I manually verified that your patch merges correctly in 7 of these
> test cases.  But one of the cases was so hard to verify that I was not
> able to thoroughly verify it (but I am still pretty confident that
> your patch works even in this case).
>
> Just in case I made a mistake in my manual verification, I also ran each
> test case through fmerge and fmerge agrees with your patched cvs on
> every test case.  For more info on the fmerge utility, see:

Jacob,

Could you send me your 8 merge errors as sanity.sh test cases?

Derek

--
Derek Price                      CVS Solutions Architect ( http://CVSHome.org )
mailto:dprice@openavenue.com     OpenAvenue ( http://OpenAvenue.com )
--
I will not say "Springfield" just to get applause.
I will not say "Springfield" just to get applause.
I will not say "Springfield" just to get applause...

          - Bart Simpson on chalkboard, _The Simpsons_