[darcs-devel] [patch1806] add an explicit type for the output of resolveConflicts

[Ben Franksen]

Ben Franksen <ben.franksen at online.de> added the comment:

Sorry, looks as if I amended or rebased in the meantime. Sending again and
will screen immediately.

5 patches for repository http://darcs.net/screened:

patch 3900e63f717181f325ffd78c1a51bcf77f3c879f
Author: Ben Franksen <ben.franksen at online.de>
Date:   Fri Jul 12 19:25:29 CEST 2019
  * move instance PrimMangleUnravelled for Prim.V1 to its own module
  
  This is a pure code move without any changes to the definitions. It serves
  as preparation for a larger refactor but makes sense in its own right.

patch 440b6e59a5dcfa644bf8405068cdc5872ceaedff
Author: Ben Franksen <ben.franksen at online.de>
Date:   Fri Jul 12 20:26:56 CEST 2019
  * cleanup and refactor mangleUnravelled

patch 0a4d1af29a1982ca59540b66a72d637a14e5ec51
Author: Ben Franksen <ben.franksen at online.de>
Date:   Fri Jul 12 21:43:03 CEST 2019
  * add an explicit type for the output of resolveConflicts
  
  This makes it clear that the output contains first the
  'mangled' view followed by all the conflicting parts.
  Currently the mangled view is the conflict markers if
  the conflict is all hunks, and one of the conflicting
  parts if not.

patch d1d723faa6f3dc0bfc6c827e18a5ca49b386892f
Author: Ben Franksen <ben.franksen at online.de>
Date:   Fri Jul 12 21:43:11 CEST 2019
  * change the return type of mangleUnravelled
  
  This makes it clear that mangleUnravelled is unable to deal with conflicts
  involving anything other than hunks. Previously we returned the unmodified
  head of the input list if that was the case, now we return Nothing.

patch 1cbd89a776d0e75c05a7e4fbc0156de14c165cd5
Author: Ben Franksen <ben.franksen at online.de>
Date:   Fri Jul 12 22:16:05 CEST 2019
  * introduce type synonyms Mangled and Unravelled

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/patch1806>
__________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: patch-preview.txt
Type: text/x-darcs-patch
Size: 28767 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20190720/dce40c92/attachment-0002.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: move-instance-primmangleunravelled-for-prim_v1-to-its-own-module.dpatch
Type: application/x-darcs-patch
Size: 77477 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20190720/dce40c92/attachment-0003.bin>
-------------- next part --------------
.