view debian/test-blacklist @ 3849:a17d4934c5ce

tests: fix a test case to not create conflicts

This is the test case where we are testing about divergence resolution of stack
of patches. If the stack is as follows:

C1 C2
 | |
B1 B2
 | |
A1 A2
 \/
base

And A1-A2, B1-B2 and C1-C2 are content-divergent, and merging A1-A2 results in
conflicts.
Now if you resolve conflicts and continue resoling B1-B2, the conflicts of A1-A2
will still be there. We need somehow to understand the work we has done and not
create conflicts again.

To test the evolution functionality for now, we make sure conflicts does not
occur.

test-drop.t
test-inhibit.t
test-simple4server.t
tests/test-simple4server-bundle2.t