Patch 1941 fix error message when merging V3 confli... (and 2 more)

Title fix error message when merging V3 confli... (and 2 more)
Superseder Nosy List bf
Related Issues
Status accepted Assigned To

Created on 2019-09-26.12:45:08 by bf, last changed 2019-09-27.11:51:07 by ganesh.

File name Status Uploaded Type Edit Remove
fix-error-message-when-merging-v3-conflictors.dpatch bf, 2019-09-26.12:45:08 application/x-darcs-patch
patch-preview.txt bf, 2019-09-26.12:45:08 text/x-darcs-patch
unnamed bf, 2019-09-26.12:45:08 text/plain
See mailing list archives for discussion on individual patches.
msg21609 (view) Author: bf Date: 2019-09-26.12:45:08
More follow-ups after patch1913 addressing points that came up during review.

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

patch d4bd3977b50c535cc3f3a4172a02603bfb17315c
Author: Ben Franksen <ben.franksen@online.de>
Date:   Thu Sep 26 09:51:50 CEST 2019
  * fix error message when merging V3 conflictors

patch d4540b498bc21f84bc95c541ea20503f0e82426a
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed Sep 25 23:15:50 CEST 2019
  * call error when we try to show an Invertible ForStorage

patch 952ea188780657e71b000ac1660e890dec57aa66
Author: Ben Franksen <ben.franksen@online.de>
Date:   Thu Sep 26 10:35:43 CEST 2019
  * use consistent naming scheme in RepoPatchV3 and document it
msg21633 (view) Author: ganesh Date: 2019-09-27.10:53:52
All fine (I didn't check every line of the renamings though :-))
Date User Action Args
2019-09-26 12:45:08bfcreate
2019-09-26 16:35:50bfsetstatus: needs-screening -> needs-review
2019-09-27 10:53:52ganeshsetmessages: + msg21633
2019-09-27 10:56:01ganeshsetstatus: needs-review -> accepted-pending-tests
2019-09-27 11:51:07ganeshsetstatus: accepted-pending-tests -> accepted