[darcs-devel] [patch2207] resolve issue2682

Ben Franksen bugs at darcs.net
Wed Jul 7 08:34:19 UTC 2021


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

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

patch f9ae44ccac2475fdcb09c7246bdcca6d2c7e46a1
Author: Ben Franksen <ben.franksen at online.de>
Date:   Mon Jul  5 09:45:10 CEST 2021
  * accept issue2682

patch d9f29cea4c3d0a09ec489d98c2b512f2ba671827
Author: Ben Franksen <ben.franksen at online.de>
Date:   Tue Jul  6 18:03:06 CEST 2021
  * improve test for issue2682

patch c4191e928af9e5163d8dea62ffa13d3ff8f3efc2
Author: Ben Franksen <ben.franksen at online.de>
Date:   Sun Jul  4 23:02:48 CEST 2021
  * re-add isConflicted method to class Conflict

patch 866ef8aac8f4cc67f91c0893f2ea0ea0c8134ae6
Author: Ben Franksen <ben.franksen at online.de>
Date:   Sun Jul  4 23:29:26 CEST 2021
  * add findConflicting to Darcs.Patch.Conflict

patch 8c843f0bdc7dabc0bacc61342cf6575e4e9fc391
Author: Ben Franksen <ben.franksen at online.de>
Date:   Mon Jul  5 13:27:51 CEST 2021
  * avoid use of the instance Named (Conflict p) for rebase unsuspend

  This is so that the fix for issue2682 does not break rebase unsuspend, but
  it also makes sense independently: when unsuspending patches we definitely
  don't want explicit dependencies to count as conflict resolutions.

patch 9411e9d8ccfb7e2c52d431c2cf2343018ec3b25b
Author: Ben Franksen <ben.franksen at online.de>
Date:   Mon Jul  5 09:54:17 CEST 2021
  * resolve issue2682: conflict not marked if tag pulled at the same time

  The fix is to consider a conflict as resolved only if all conflicting
  patches are (transitively) explicitly depended on by a single patch.

----------
files: accept-issue2682.dpatch, patch-preview.txt
messages: 22905
nosy: bf
status: needs-screening
title: resolve issue2682

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/patch2207>
__________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: patch-preview.txt
Type: text/x-darcs-patch
Size: 18959 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20210707/32acec1c/attachment-0002.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: accept-issue2682.dpatch
Type: application/x-darcs-patch
Size: 20558 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20210707/32acec1c/attachment-0003.bin>


More information about the darcs-devel mailing list