darcs

Patch 1503 WIP: resolve issue2482 darcs mark-conflicts FILE

Title WIP: resolve issue2482 darcs mark-conflicts FILE
Superseder Nosy List bf
Related Issues
Status followup-in-progress Assigned To
Milestone

Created on 2016-05-06.20:26:31 by bf, last changed 2017-01-11.05:31:12 by ganesh.

Files
File name Status Uploaded Type Edit Remove
patch-preview.txt bf, 2016-05-06.20:26:30 text/x-darcs-patch
unnamed bf, 2016-05-06.20:26:30 text/plain
wip_-resolve-issue2482-darcs-mark_conflicts-file.dpatch bf, 2016-05-06.20:26:30 application/x-darcs-patch
See mailing list archives for discussion on individual patches.
Messages
msg19217 (view) Author: bf Date: 2016-05-06.20:26:30
This is not (yet) for screened; it contains (unconditional) debug output and
I am not sure I have covered all cases. I would love to get some feedback.

The code is more or less a re-write, but it seems to work... The support
code at the end was added mostly because I was getting headaches trying to
reconcile all the different types used for (argument-) path lists, I simply
needed some structure where I could encapsulate things like conversions,
intersection, and lifting. This patch has been lying around here for too
long and I don't want to let the work go to waste just because the result is
not yet perfect. I hope I'll find the time to finish it...

1 patch for repository http://darcs.net/screened:

patch d4ba03a976c89a0f219772be2d6a9e1cb36ffe39
Author: Ben Franksen <benjamin.franksen@helmholtz-berlin.de>
Date:   Tue Mar 15 18:23:47 CET 2016
  * WIP: resolve issue2482 darcs mark-conflicts FILE
Attachments
History
Date User Action Args
2016-05-06 20:26:31bfcreate
2017-01-11 05:31:12ganeshsetstatus: needs-screening -> followup-in-progress