Re: Merging bug (wrong conflicts)

[Karl Tomlinson]

Here is a short (25 line) test case for configuration 3) of
http://www.mail-archive.com/bug-cvs%40gnu.org/msg00803.html

M=O (or M=Y):

s
x
m
m
x
x
x
x
x
x
x
x
x
x
s
s
s
s
s
s
s
s
s
s
v

Y (or O):

v
s
m
s
s
s
s
s
s
s
s
s
s
v

And here is a slightly simpler test case for configuration 2):

M:

v
s
x
m
m
x
s
v
s
x
m
m
x
s
v

O:

s
x
m
m
x
s
v
s
x
m
m
x
s

Y:

s
m
s
v
s
m
s

If any of the test cases you mention don't fit into the configurations
I described, I would be interested to see them.

I imagine that it is still possible to break the merging code in cvs
without making these test cases fail, but I'm not sure that we could
ever provide enough test cases to prevent this.  At least these test
cases provide an indication of what sort of thing my patch fixed.