Patch 1747 handle binary patches in applyAndTryToFixFL (for prim V1)

Title handle binary patches in applyAndTryToFixFL (for prim V1)
Superseder Nosy List bf
Related Issues
Status accepted Assigned To

Created on 2018-10-18.19:34:35 by bf, last changed 2018-11-25.12:20:34 by ganesh.

File name Status Uploaded Type Edit Remove
handle-binary-patches-in-applyandtrytofixfl-_for-prim-v1_.dpatch bf, 2018-10-18.19:34:34 application/x-darcs-patch
patch-preview.txt bf, 2018-10-18.19:34:34 text/x-darcs-patch
unnamed bf, 2018-10-18.19:34:34 text/plain
See mailing list archives for discussion on individual patches.
msg20415 (view) Author: bf Date: 2018-10-18.19:34:34
1 patch for repository http://darcs.net/screened:

patch e6f06c7f38efd8896655fda3cef2dd2be2cc8fee
Author: Ben Franksen <ben.franksen@online.de>
Date:   Thu Oct 18 21:26:47 CEST 2018
  * handle binary patches in applyAndTryToFixFL (for prim V1)
  Darcs's conflict resolution of binary patches is completely broken.
  Apparently, it leaves pending in an inconsistent state which then gets
  recorded by unwitting users. This happens a lot lately where I work.
  With this patch I can at least use 'darcs repair' to fix the broken repos.
msg20488 (view) Author: ganesh Date: 2018-11-17.15:49:54
Seems plausible. Might be nice to have a test that demonstrates
the sequence of actions that gives a broken repo and shows that
repair now fixes it.
msg20491 (view) Author: ganesh Date: 2018-11-17.16:07:19
This semantically depends on the AnchoredPath refactoring
(patch1745) so I'll push it to reviewed once the review of
that is finished.
msg20534 (view) Author: bf Date: 2018-11-20.03:36:56
If it happens again I will try to figure out what steps led to this 
problem and try to reproduce it. Last time I was too busy fixing darcs 
repair so I could get the repo back into a usable shape.
Date User Action Args
2018-10-18 19:34:35bfcreate
2018-10-18 19:35:32bfsetstatus: needs-screening -> needs-review
2018-11-17 15:49:54ganeshsetstatus: needs-review -> accepted-pending-tests
messages: + msg20488
2018-11-17 16:07:19ganeshsetmessages: + msg20491
2018-11-20 03:36:57bfsetmessages: + msg20534
2018-11-25 12:20:34ganeshsetstatus: accepted-pending-tests -> accepted