Safe Haskell | Safe-Infered |
---|
Darcs.Patch.Conflict
Documentation
class (Effect p, PatchInspect (PrimOf p)) => Conflict p where
Methods
listConflictedFiles :: p -> [FilePath]
resolveConflicts :: p -> [[Sealed (FL (PrimOf p))]]
conflictedEffect :: p -> [IsConflictedPrim (PrimOf p)]
class CommuteNoConflicts p where
Methods
commuteNoConflicts :: (p :> p) -> Maybe (p :> p)
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.
Instances
CommuteNoConflicts p => CommuteNoConflicts (RL p) | |
CommuteNoConflicts p => CommuteNoConflicts (FL p) | |
PrimPatch prim => CommuteNoConflicts (Patch prim) | |
PrimPatch prim => CommuteNoConflicts (RealPatch prim) |
data IsConflictedPrim prim where
Constructors
IsC :: !ConflictState -> !prim -> IsConflictedPrim prim |
data ConflictState
Constructors
Okay | |
Conflicted | |
Duplicated |