[darcs-devel] [patch2028] use mergerFLFL in instance Merge (FL p) (and 1 more)

[Ben Franksen]

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

I think I may have failed to send these patches, they were not in screened
and I have accidentally pushed them to reviewed. I just obliterated them
from reviewed. Sorry for the mess.

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

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.

----------
files: patch-preview.txt, unnamed, use-mergerflfl-in-instance-merge-_fl-p_.dpatch
messages: 22040
nosy: bf
status: needs-screening
title: use mergerFLFL in instance Merge (FL p) (and 1 more)

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/patch2028>
__________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: patch-preview.txt
Type: text/x-darcs-patch
Size: 2016 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20200620/2bece1da/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: use-mergerflfl-in-instance-merge-_fl-p_.dpatch
Type: application/x-darcs-patch
Size: 11641 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20200620/2bece1da/attachment-0001.bin>
-------------- next part --------------
.