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