[darcs-devel] [patch1971] introduce some generic merge function helpers

Ben Franksen bugs at darcs.net
Thu May 21 08:48:17 UTC 2020


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

To make progress with review, I have added two follow-up patches, which I'll
self-accept.

3 patches for repository http://darcs.net/reviewed:

patch 80715460da0bdfa1ac95cd2361a920bb50fe6bb6
Author: Ganesh Sittampalam <ganesh at earth.li>
Date:   Tue Jan 28 07:36:39 CET 2020
  * introduce some generic merge function helpers

patch 9b0829c6113fb002675d42120a47b106f0b58584
Author: Ben Franksen <ben.franksen at online.de>
Date:   Thu May 21 10:19:25 CEST 2020
  * use mergerFLFL in instance Merge (FL p)

patch 32da7bf3481dfe70c962e3553be591c62fb424e1
Author: Ben Franksen <ben.franksen at online.de>
Date:   Thu May 21 10:20:54 CEST 2020
  * fix convert darcs2 test data after patch 9b0829c6113f
  
  This accounts for the fact that the on-disk format of V2 conflictors does
  not order the conflicting patches. This order is different now because the
  new definition merge for FLs merges in a different order.

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/patch1971>
__________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: patch-preview.txt
Type: text/x-darcs-patch
Size: 3811 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20200521/43af69a2/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: introduce-some-generic-merge-function-helpers_0.dpatch
Type: application/x-darcs-patch
Size: 10642 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20200521/43af69a2/attachment-0001.bin>
-------------- next part --------------
.





More information about the darcs-devel mailing list