[darcs-devel] [patch1872] regard explicit dependencies as resolving conflicts

[Ben Franksen]

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

We have discussed this change on the list. I think this is the only viable
solution we can currently implement without a change in the semantics of
prim patches. It also lines up with (and gives an official justification
for) not looking beyond the latest clean tag when searching for conflicts
(see patchsetConflictResolutions).

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

patch 6f7195b9d5fd43169850bc85f2ebd28bbd52abb9
Author: Ben Franksen <ben.franksen at online.de>
Date:   Sat Jul 20 13:51:58 CEST 2019
  * regard explicit dependencies as resolving conflicts
  
  This is necessary to allow users to resolve a conlfict in favour of what
  darcs does by default (i.e. apply neither of the conflicting changes). The
  implementation is mostly in Darcs.Patch.Named which now has an instance
  Conflict. The PatchInfoAnd instance only delegates to the contained Named 
  patch. A subtlety here is that for efficiency and correctness in the face of
  lazy repos, we must make sure that hopefully is lazy in its patch argument.

----------
files: patch-preview.txt, regard-explicit-dependencies-as-resolving-conflicts.dpatch, unnamed
messages: 21103
nosy: bf
status: needs-screening
title: regard explicit dependencies as resolving conflicts

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/patch1872>
__________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: patch-preview.txt
Type: text/x-darcs-patch
Size: 6295 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20190815/4cc4cce1/attachment-0002.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: regard-explicit-dependencies-as-resolving-conflicts.dpatch
Type: application/x-darcs-patch
Size: 67161 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20190815/4cc4cce1/attachment-0003.bin>
-------------- next part --------------
.