darcs-beta-2.3.98.3: a distributed, interactive, smart revision control system

Darcs.SelectChanges

Synopsis

Documentation

filterOutConflictsSource

Arguments

:: RepoPatch p 
=> [DarcsFlag]

Command-line options. Only SkipConflicts is significant; filtering will happen iff it is present

-> RL (PatchInfoAnd p)

Recorded patches from repository, starting from same context as the patches to filter

-> Repository p

Repository itself, used for grabbing unrecorded changes

-> FL (PatchInfoAnd p)

Patches to filter

-> IO (Bool, Sealed (FL (PatchInfoAnd p)))

(True iff any patches were removed, possibly filtered patches)

Optionally remove any patches (+dependencies) from a sequence that conflict with the recorded or unrecorded changes in a repo