darcs-beta- a distributed, interactive, smart revision control system



class CommuteNoConflicts p whereSource


commuteNoConflicts :: (p :> p) x y -> Maybe ((p :> p) x y)Source

If commuteNoConflicts x :> y succeeds, we know that that x commutes past y without any conflicts. This function is useful for patch types for which commute is defined to always succeed; so we need some way to pick out the specific cases where commutation succeeds without any conflicts.

data IsConflictedPrim prim whereSource


IsC :: !ConflictState -> !(prim x y) -> IsConflictedPrim prim