This test fails with the rebase with conflicted fixups because we now
get a conflict on unsuspend.
To see more clearly what goes on, I changed the test so that the addfile
is recorded separately as a first step. Then the test succeeds with
darcs-2 because merging the amended version of the patch produces a
Duplicate fixup which isn't reported as a conflict. For darcs-1 and
darcs-3 you get a conflict instead. I don't think this is unreasonable
or surprising behavior, though the fact that this works with a prim
based rebase is certainly nice.
|