After this bundle, all tests should succeed.
1 patch for repository /home/ben/src/darcs/without-v3:
patch d06188e92994e0f9d27b6c4c0164c781ecdc099f
Author: Ben Franksen <ben.franksen@online.de>
Date: Fri Feb 15 16:58:17 CET 2019
* fix prop_conflictsCommutePastConflictor
The property was almost correct but not quite. Indeed, patches we conflict
with may not individually commute past the conflictor because of
dependencies between these patches. However we can always commute them to a
contiguous segment right before the conflictor, and then commute them past
the conflictor as a whole.
Attachments
|