Patch 2236 accept and resolve issue189

Title accept and resolve issue189
Superseder Nosy List bfrk
Related Issues
Status accepted Assigned To

Created on 2022-04-13.08:00:21 by bfrk, last changed 2022-04-14.10:24:57 by bfrk.

File name Status Uploaded Type Edit Remove
fix_-preserve-output-_stderr_-stdout_-of-an-external-merge-tool.dpatch bfrk, 2022-04-13.08:00:20 application/x-darcs-patch
patch-preview.txt bfrk, 2022-04-13.08:00:20 text/x-darcs-patch
See mailing list archives for discussion on individual patches.
msg22982 (view) Author: bfrk Date: 2022-04-13.08:00:20
This bug was reported in 2009(!!) and fixing it wasn't even difficult.

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

patch 9743efb239f4e512e498f43734efa1b17b1ebc33
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed Apr 13 09:45:10 CEST 2022
  * fix: preserve output (stderr, stdout) of an external merge tool

  This makes it easier to diagnose problems when using an external merge tool.

patch fe5100f456adf875cf990f2ce3ab3f378092d735
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed Apr 13 09:42:32 CEST 2022
  * fix: darcs should fail if an external merge tool does

  This is necessary in order to detect problems and write proper test scripts.

patch e56598ff37b868d80618b48fc61c5cc5aec391a8
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed Apr 13 09:49:04 CEST 2022
  * accept issue189: external merge with renamed files

  This patch depends on the one that causes darcs to fail if the external
  merge tool does, otherwise the test script cannot detect the problem.

patch 50e11419e9d43bd2460448f112a8f20fa99af3a2
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed Apr 13 09:35:59 CEST 2022
  * resolve issue189: external merge with renamed files

  Indeed, there was a glaring error in the externalResolution procedure.
msg22989 (view) Author: bfrk Date: 2022-04-14.10:24:57
Date User Action Args
2022-04-13 08:00:21bfrkcreate
2022-04-14 10:24:57bfrksetstatus: needs-screening -> accepted
messages: + msg22989