[darcs-devel] [patch1948] v3: fix name of a local variable that di... (and 7 more)
Ben Franksen
bugs at darcs.net
Mon Oct 7 12:15:22 UTC 2019
Ben Franksen <ben.franksen at online.de> added the comment:
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 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 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
patch 6ea89104b2e5e52da445a348639db5813aea5ee0
Author: Ben Franksen <ben.franksen at online.de>
Date: Mon Oct 7 14:11:32 CEST 2019
* v3: extend invariant for Contexted patches inside a Conflictor
__________________________________
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: 30058 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20191007/790a6b0d/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_0.dpatch
Type: application/x-darcs-patch
Size: 42894 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20191007/790a6b0d/attachment-0003.bin>
-------------- next part --------------
.
More information about the darcs-devel
mailing list