Patch 2384 resolve issue2718: avoid using conflictedPaths to dete...

Title resolve issue2718: avoid using conflictedPaths to dete...
Superseder Nosy List bfrk
Related Issues
Status accepted Assigned To

Created on 2024-05-10.14:03:16 by bfrk, last changed 2024-05-11.20:36:47 by ganesh.

File name Status Uploaded Type Edit Remove
patch-preview.txt bfrk, 2024-05-10.14:03:15 text/x-darcs-patch
resolve-issue2718_-avoid-using-conflictedpaths-to-detect-whether-we-have-conflicts_1.dpatch bfrk, 2024-05-10.14:03:15 application/x-darcs-patch
See mailing list archives for discussion on individual patches.
msg23804 (view) Author: bfrk Date: 2024-05-10.14:03:15
1 patch for repository /home/franksen/src/darcs/reviewed:

patch 2a82da8f0a29f0ec62e0b5aa7853f5a8886073ee
Author: Ben Franksen <ben.franksen@online.de>
Date:   Fri May 10 15:02:08 CEST 2024
  * resolve issue2718: avoid using conflictedPaths to detect whether we have conflicts

  This adds an explicit test named haveConflicts, which looks at the "sum" of
  the mangled and unmangled conflicts. This is cleaner because in principle
  (albeit not in practice) there could be conflicts that do not involve any
  file paths. Consequently, the warning message for conflicts is now separate
  from the listing of the affected paths.
msg23810 (view) Author: ganesh Date: 2024-05-11.20:12:08
Nice improvement - thanks!
Date User Action Args
2024-05-10 14:03:16bfrkcreate
2024-05-10 14:03:33bfrksetstatus: needs-screening -> needs-review
2024-05-11 20:12:08ganeshsetmessages: + msg23810
2024-05-11 20:12:12ganeshsetstatus: needs-review -> accepted-pending-tests
2024-05-11 20:36:47ganeshsetstatus: accepted-pending-tests -> accepted