darcs-2.11.0: a distributed, interactive, smart revision control system

Safe HaskellNone

Darcs.Patch.Conflict

Documentation

class CommuteNoConflicts p where

Methods

commuteNoConflicts :: (p :> p) wX wY -> Maybe ((p :> p) wX wY)

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 where

Constructors

IsC :: !ConflictState -> !(prim wX wY) -> IsConflictedPrim prim 

Instances

Show2 prim => Show (IsConflictedPrim prim) 

mangleUnravelled :: PrimPatch prim => [Sealed (FL prim wX)] -> Sealed (FL prim wX)