[darcs-devel] [patch1948] v3: fix name of a local variable that di... (and 7 more)

Ben Franksen bugs at darcs.net
Thu Oct 3 12:16:54 UTC 2019


New submission from Ben Franksen <ben.franksen at online.de>:

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 at 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 at 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 at 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 at 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 at 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 at online.de>
Date:   Wed Oct  2 21:35:39 CEST 2019
  * extend invariant for contexted patches

patch dc447cf2cfdf771b36260e50c3bd0fa9dd9ce7ed
Author: Ben Franksen <ben.franksen at 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 at online.de>
Date:   Thu Oct  3 13:50:03 CEST 2019
  * use RepoPatchV3 type synonym in instance definition

----------
files: patch-preview.txt, unnamed, v3_-fix-name-of-a-local-variable-that-didn_t-follow-the-convention.dpatch
messages: 21667
nosy: bf
status: needs-screening
title: v3: fix name of a local variable that di... (and 7 more)

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/patch1948>
__________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: patch-preview.txt
Type: text/x-darcs-patch
Size: 31528 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20191003/802b0728/attachment-0002.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: v3_-fix-name-of-a-local-variable-that-didn_t-follow-the-convention.dpatch
Type: application/x-darcs-patch
Size: 47230 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20191003/802b0728/attachment-0003.bin>
-------------- next part --------------
.





More information about the darcs-devel mailing list