Patch 2028 use mergerFLFL in instance Merge (FL p) (and 1 more)

Title use mergerFLFL in instance Merge (FL p) (and 1 more)
Superseder Nosy List bf
Related Issues
Status accepted Assigned To

Created on 2020-06-20.09:00:01 by bf, last changed 2020-07-18.13:49:00 by ganesh.

File name Status Uploaded Type Edit Remove
patch-preview.txt bf, 2020-06-20.09:00:01 text/x-darcs-patch
unnamed bf, 2020-06-20.09:00:01 text/plain
use-mergerflfl-in-instance-merge-_fl-p_.dpatch bf, 2020-06-20.09:00:01 application/x-darcs-patch
See mailing list archives for discussion on individual patches.
msg22040 (view) Author: bf Date: 2020-06-20.09:00:01
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@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@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.
msg22071 (view) Author: ganesh Date: 2020-06-20.22:28:29
Date User Action Args
2020-06-20 09:00:01bfcreate
2020-06-20 09:02:29bfsetstatus: needs-screening -> needs-review
2020-06-20 22:28:29ganeshsetstatus: needs-review -> accepted-pending-tests
messages: + msg22071
2020-07-18 13:49:00ganeshsetstatus: accepted-pending-tests -> accepted