These are minor refactors of RepoPatchV3, plus the ToPrim/FormPrim split as
a preparation for conversion to darcs-3, and a strengthening of Contexted
invariants. Finally, resolveConflicts has been moved to its own module.

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

patch 315bbb9cc53527c6c903b788b4bdab9212bc2f4f
Author: Ben Franksen <ben.franksen@online.de>
Date:   Mon Sep 30 17:07:30 CEST 2019
  * v3: fix name of a local variable that didn't follow the convention

patch 6d7c189c871f41fd9ec1547047655be8933612b4
Author: Ben Franksen <ben.franksen@online.de>
Date:   Mon Sep 30 17:42:23 CEST 2019
  * define swapCleanMerge and use it and swapMerge in RepoPatchV3

patch 163f018bc9937a16d8bce84bc97ce2142c23ff8b
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed Sep 25 21:06:53 CEST 2019
  * decouple ToPrim and FromPrim
  
  For compatibility we retain ToFromPrim as a constraint synonym.

patch fbafac1c1684bb56c86c4b351aae99701305619c
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed Oct  2 12:33:52 CEST 2019
  * refactor Conflictor/Conflictor case of RepoPatchV3 merge
  
  This just defines the components separately using let.

patch 629f0a24be2bb0b7822b92e9c2f8776b33c90b3b
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed Oct  2 19:35:15 CEST 2019
  * RepoPatchV3: simplify Conflictor/Conflictor case of cleanMerge

patch f69d613c57c6622ba1b3a8e583f191da18af2645
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed Oct  2 21:35:39 CEST 2019
  * extend invariant for contexted patches

patch dc447cf2cfdf771b36260e50c3bd0fa9dd9ce7ed
Author: Ben Franksen <ben.franksen@online.de>
Date:   Thu Oct  3 13:39:22 CEST 2019
  * move conflict resolution for RepoPatchV3 to its own module

patch 504c2ea2f8145511919e770df0c745667370ba2c
Author: Ben Franksen <ben.franksen@online.de>
Date:   Thu Oct  3 13:50:03 CEST 2019
  * use RepoPatchV3 type synonym in instance definition

Attachments

• patch-preview.txt
• unnamed
• v3_-fix-name-of-a-local-variable-that-didn_t-follow-the-convention.dpatch

Were you planning on screening these? I can't see any objection from
looking at the descriptions.

> Were you planning on screening these? I can't see any objection from
> looking at the descriptions.

I am having second thoughts about strengthening the invariants for
Contexted patches. While the stronger invariant is fine for the
Contexted patches inside a Conflictor, in general it would limit their
flexibility too much. For instance, it would prohibit an implementation
of Duplicates (which I have not yet given up on). I will send a rebased
bundle with the stronger invariant moved to a separate property that
need not hold for all Contexted patches and then use that for Conflictors.

Attachments

• pEpkey.asc

This bundle amends only the one patch about the extended invariant for
Contexted patches (inside a Conflictor). Will screen now.

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

patch 315bbb9cc53527c6c903b788b4bdab9212bc2f4f
Author: Ben Franksen <ben.franksen@online.de>
Date:   Mon Sep 30 17:07:30 CEST 2019
  * v3: fix name of a local variable that didn't follow the convention

patch 6d7c189c871f41fd9ec1547047655be8933612b4
Author: Ben Franksen <ben.franksen@online.de>
Date:   Mon Sep 30 17:42:23 CEST 2019
  * define swapCleanMerge and use it and swapMerge in RepoPatchV3

patch 163f018bc9937a16d8bce84bc97ce2142c23ff8b
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed Sep 25 21:06:53 CEST 2019
  * decouple ToPrim and FromPrim
  
  For compatibility we retain ToFromPrim as a constraint synonym.

patch fbafac1c1684bb56c86c4b351aae99701305619c
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed Oct  2 12:33:52 CEST 2019
  * refactor Conflictor/Conflictor case of RepoPatchV3 merge
  
  This just defines the components separately using let.

patch 629f0a24be2bb0b7822b92e9c2f8776b33c90b3b
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed Oct  2 19:35:15 CEST 2019
  * RepoPatchV3: simplify Conflictor/Conflictor case of cleanMerge

patch dc447cf2cfdf771b36260e50c3bd0fa9dd9ce7ed
Author: Ben Franksen <ben.franksen@online.de>
Date:   Thu Oct  3 13:39:22 CEST 2019
  * move conflict resolution for RepoPatchV3 to its own module

patch 504c2ea2f8145511919e770df0c745667370ba2c
Author: Ben Franksen <ben.franksen@online.de>
Date:   Thu Oct  3 13:50:03 CEST 2019
  * use RepoPatchV3 type synonym in instance definition

patch 6ea89104b2e5e52da445a348639db5813aea5ee0
Author: Ben Franksen <ben.franksen@online.de>
Date:   Mon Oct  7 14:11:32 CEST 2019
  * v3: extend invariant for Contexted patches inside a Conflictor

Attachments

• patch-preview.txt
• unnamed
• v3_-fix-name-of-a-local-variable-that-didn_t-follow-the-convention_0.dpatch

>   * v3: fix name of a local variable that didn't follow the convention

OK

>   * define swapCleanMerge and use it and swapMerge in RepoPatchV3

OK

>   * decouple ToPrim and FromPrim
>   
>   For compatibility we retain ToFromPrim as a constraint synonym.

OK (though I don't see much value in retaining ToFromPrim)

>   * refactor Conflictor/Conflictor case of RepoPatchV3 merge
>   
>   This just defines the components separately using let.

OK

>   * RepoPatchV3: simplify Conflictor/Conflictor case of cleanMerge

OK

>   * move conflict resolution for RepoPatchV3 to its own module

OK

>   * use RepoPatchV3 type synonym in instance definition

OK

>   * v3: extend invariant for Contexted patches inside a Conflictor

OK

>>   For compatibility we retain ToFromPrim as a constraint synonym.
> 
> OK (though I don't see much value in retaining ToFromPrim)

I agree. As you remarked a while ago, its only consumer is D.P.V2.Non
and we could move it there if you prefer that. Or remove it and inline
the ToPrim and FromPrim constraints.

Attachments

• pEpkey.asc