Darcs.Repository.Resolution

Documentation

standardResolution :: RepoPatch p => RL (PatchInfoAnd p) wO wX -> RL (PatchInfoAnd p) wX wY -> StandardResolution (PrimOf p) wY

rebaseResolution :: (Conflict p, PrimPatch (PrimOf p)) => RL (PatchInfoAnd p) wO wX -> RL (Named p) wX wY -> StandardResolution (PrimOf p) wY

Like standardResolution but it doesn't use the instance (Named p) because the traling list of patches may contain "fake" conflictors.

externalResolution

Arguments

:: forall p wX wY wZ wA. (RepoPatch p, ApplyState p ~ Tree)

=> DiffAlgorithm

-> Tree IO

working tree

-> String

external merge tool command

-> WantGuiPause

tell whether we want GUI pause

-> FL (PrimOf p) wX wY

our effect

-> FL (PrimOf p) wX wZ

their effect

-> FL p wY wA

them merged

-> IO (Sealed (FL (PrimOf p) wA))

patchsetConflictResolutions :: RepoPatch p => PatchSet p Origin wX -> StandardResolution (PrimOf p) wX

data StandardResolution prim wX

Constructors

StandardResolution

Fields

• mangled :: Mangled prim wX
• unmangled :: [Unravelled prim wX]
• conflictedPaths :: [AnchoredPath]

announceConflicts :: PrimPatch prim => String -> AllowConflicts -> StandardResolution prim wX -> IO Bool

warnUnmangled :: PrimPatch prim => Maybe [AnchoredPath] -> StandardResolution prim wX -> IO ()

showUnmangled :: PrimPatch prim => Maybe [AnchoredPath] -> [Unravelled prim wX] -> Doc

showUnravelled :: PrimPatch prim => Doc -> Unravelled prim wX -> Doc