Patch 2355 resolve issue2708: regard unrecorded changes as potent...

Title resolve issue2708: regard unrecorded changes as potent...
Superseder Nosy List bfrk
Related Issues
Status accepted Assigned To

Created on 2023-08-24.16:29:21 by bfrk, last changed 2024-02-18.16:29:40 by ganesh.

File name Status Uploaded Type Edit Remove
patch-preview.txt bfrk, 2023-08-24.16:29:20 text/x-darcs-patch
resolve-issue2708_-regard-unrecorded-changes-as-potential-conflict-resolutions.dpatch bfrk, 2023-08-24.16:29:20 application/x-darcs-patch
test-that-unrecorded-changes-act-as-conflict-resolutions.dpatch bfrk, 2023-09-05.12:05:35 application/octet-stream
See mailing list archives for discussion on individual patches.
msg23691 (view) Author: bfrk Date: 2023-08-24.16:29:20
This is an incompatible change in semantics, so I am not screening it yet.

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

patch e574b9dffb0002906570ed49e319ffea75d6bd16
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed Jul  5 13:47:57 CEST 2023
  * resolve issue2708: regard unrecorded changes as potential conflict resolutions
msg23705 (view) Author: ganesh Date: 2023-08-28.13:28:03
This seems like a sensible change to me in principle. It resolves an
annoying UI problem if resolving conflicts incrementally.

I don't think it makes any existing workflows significantly harder, if 
you really do want the original resolutions despite having made more 
changes then you can just revert yourself.

I don't know if we should tell the user anything? Probably not.

You can consider the patch as reviewed as well, except maybe it
could do with a test?
msg23711 (view) Author: bfrk Date: 2023-08-28.16:33:59
Thanks. Yes, adding a test is a good idea. Will follow up.
msg23722 (view) Author: bfrk Date: 2023-09-05.12:05:34
Following up with test of functionality.

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

patch 748489a273f9fb7f4d72b7bca521c6dabcd386c2
Author: Ben Franksen <ben.franksen@online.de>
Date:   Tue Sep  5 13:52:27 CEST 2023
  * test that unrecorded changes act as conflict resolutions
msg23733 (view) Author: ganesh Date: 2024-02-18.14:15:19
Looks good, thanks.
Date User Action Args
2023-08-24 16:29:21bfrkcreate
2023-08-28 13:28:03ganeshsetmessages: + msg23705
2023-08-28 16:34:01bfrksetstatus: needs-screening -> followup-in-progress
messages: + msg23711
2023-09-05 12:05:36bfrksetfiles: + test-that-unrecorded-changes-act-as-conflict-resolutions.dpatch
messages: + msg23722
2023-09-05 12:06:10bfrksetstatus: followup-in-progress -> review-in-progress
2024-02-18 14:15:19ganeshsetstatus: review-in-progress -> accepted-pending-tests
messages: + msg23733
2024-02-18 16:29:40ganeshsetstatus: accepted-pending-tests -> accepted