Darcs/Repository/Merge.hs

21 module Darcs.Repository.Merge  module
26 import Darcs.Prelude
36 import Darcs.Util.Tree( Tree )
37 import Darcs.Util.External ( backupByCopying )
39 import Darcs.Patch
43 import Darcs.Patch.Apply ( ApplyState )
44 import Darcs.Patch.Ident ( merge2FL )
45 import Darcs.Patch.Named ( patchcontents, anonymous )
46 import Darcs.Patch.PatchInfoAnd ( PatchInfoAnd, n2pia, hopefully )
47 import Darcs.Patch.Progress( progressFL )
48 import Darcs.Patch.Set ( PatchSet, Origin, patchSet2RL )
49 import Darcs.Patch.Witnesses.Ordered
52 import Darcs.Patch.Witnesses.Sealed ( Sealed(Sealed), seal )
54 import Darcs.Repository.Flags
68 import Darcs.Repository.Hashed
73 import Darcs.Repository.Pristine
77 import Darcs.Repository.InternalTypes ( Repository, repoLocation )
78 import Darcs.Repository.Pending ( setTentativePending )
79 import Darcs.Repository.Resolution
85 import Darcs.Repository.State ( unrecordedChanges, readUnrecorded )
87 import Darcs.Util.Prompt ( promptYorn )
88 import Darcs.Util.Path ( anchorPath, displayPath )
89 import Darcs.Util.Progress( debugMessage )
90 import Darcs.Util.Printer.Color ( ePutDocLn )
91 import Darcs.Util.Printer ( redText, vcat )