[darcs-users] [patch39] Refactor Darcs.Commands.Pull (and 5 more)

[Jason Dagit]

Jason Dagit <dagitj at gmail.com> added the comment:

My apologies once again for not applying this before a conflict arose.

If I apply this and mark the conflicts I see this:
$ darcs whats src/Darcs/Commands/Pull.lhs
What's new in "src/Darcs/Commands/Pull.lhs":

hunk ./src/Darcs/Commands/Pull.lhs 52
+v v v v v v v
+#ifdef GADT_WITNESSES
hunk ./src/Darcs/Commands/Pull.lhs 55
-import Darcs.Witnesses.Ordered ( (:>)(..), (:\/:)(..), RL(..),
-                             mapFL, nullFL, reverseRL, mapRL )
+#endif
+import Darcs.Patch.Info (PatchInfo)
+import Darcs.Witnesses.Ordered ( (:>)(..), (:\/:)(..), RL(..), FL(..),
+                             mapFL, nullFL, reverseRL, mapRL, mapFL_FL )
+*************
+#ifdef GADT_WITNESSES
+import Darcs.Patch.Set ( Origin )
+#endif
+import Darcs.Patch.Info (PatchInfo)
+import Darcs.Witnesses.Ordered ( (:>)(..), (:\/:)(..), RL(..), FL(..),
+                             mapFL, nullFL, reverseRL, mapRL, mapFL_FL )
+*************
+import Darcs.Patch.Info (PatchInfo)
+import Darcs.Patch.Bundle ( make_bundle, patchFilename)
+import Darcs.Patch.Set ( Origin )
+import Darcs.Witnesses.Ordered ( (:>)(..), (:\/:)(..), RL(..), FL(..),
+                             mapFL, nullFL, reverseRL, mapRL, mapFL_FL )
+*************
+import Darcs.Patch.Info (PatchInfo)
+import Darcs.Patch.Set ( Origin )
+import Darcs.Witnesses.Ordered ( (:>)(..), (:\/:)(..), RL(..), FL(..),
+                             mapFL, nullFL, reverseRL, mapRL, mapFL_FL )
+^ ^ ^ ^ ^ ^ ^


My guess is that the correct ones are:
hunk ./src/Darcs/Commands/Pull.lhs 52
+#ifdef GADT_WITNESSES
hunk ./src/Darcs/Commands/Pull.lhs 55
+#ifdef GADT_WITNESSES
+import Darcs.Patch.Set ( Origin )
+#endif
+import Darcs.Patch.Info (PatchInfo)
+import Darcs.Patch.Bundle ( make_bundle, patchFilename)
+import Darcs.Witnesses.Ordered ( (:>)(..), (:\/:)(..), RL(..), FL(..),
+                             mapFL, nullFL, reverseRL, mapRL, mapFL_FL )

Sorry!
Jason

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/patch39>
__________________________________