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

Safe HaskellNone

Darcs.Patch.V1.Commute

Synopsis

Documentation

merge :: Merge p => (p :\/: p) wX wY -> (p :/\: p) wX wY

merger :: PrimPatch prim => String -> RepoPatchV1 prim wX wY -> RepoPatchV1 prim wX wZ -> Sealed (RepoPatchV1 prim wY)

merger takes two patches, (which have been determined to conflict) and constructs a Merger patch to represent the conflict. p1 is considered to be conflicting with p2 (p1 is the first patch in the repo ordering), the resulting Merger is therefore a representation of p2.

unravel :: PrimPatch prim => RepoPatchV1 prim wX wY -> [Sealed (FL prim wX)]

publicUnravel :: PrimPatch prim => RepoPatchV1 prim wX wY -> [Sealed (FL prim wY)]