| Safe Haskell | None |
|---|---|
| Language | Haskell2010 |
Darcs.Patch.Conflict
Documentation
class (Effect p, PatchInspect (PrimOf p)) => Conflict p where Source #
Minimal complete definition
Methods
resolveConflicts :: p wX wY -> [[Sealed (FL (PrimOf p) wY)]] Source #
conflictedEffect :: p wX wY -> [IsConflictedPrim (PrimOf p)] Source #
Instances
| Conflict DummyPatch Source # | |
| (CommuteNoConflicts p, Conflict p) => Conflict (RL p) Source # | |
| (CommuteNoConflicts p, Conflict p) => Conflict (FL p) Source # | |
| (CommuteNoConflicts p, Conflict p) => Conflict (Named p) Source # | |
| Conflict p => Conflict (Suspended p) Source # | |
| (PrimPatchBase p, Invert p, Effect p, FromPrim p, Merge p, Conflict p, CommuteNoConflicts p) => Conflict (RebaseChange p) Source # | |
| (PrimPatchBase p, Conflict p, CommuteNoConflicts p, Invert p) => Conflict (RebaseSelect p) Source # | |
| PrimPatch prim => Conflict (RepoPatchV2 prim) Source # | |
| (CommuteNoConflicts p, Conflict p) => Conflict (WrappedNamed rt p) Source # | |
class CommuteNoConflicts p where Source #
Minimal complete definition
Methods
commuteNoConflicts :: (p :> p) wX wY -> Maybe ((p :> p) wX wY) 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 DummyPatch Source # | |
| CommuteNoConflicts p => CommuteNoConflicts (RL p) Source # | |
| CommuteNoConflicts p => CommuteNoConflicts (FL p) Source # | |
| CommuteNoConflicts (RebaseChange p) Source # | |
| PrimPatch prim => CommuteNoConflicts (RepoPatchV2 prim) Source # | |
listConflictedFiles :: Conflict p => p wX wY -> [FilePath] Source #
data IsConflictedPrim prim where Source #
Constructors
| IsC :: !ConflictState -> !(prim wX wY) -> IsConflictedPrim prim |
Instances
| Show2 prim => Show (IsConflictedPrim prim) Source # | |