Patch 2233: resolve issue1819: external-merge and no-allow-conflicts - Darcs bug tracker

Title	resolve issue1819: external-merge and no-allow-conflicts
Superseder		Nosy List	bfrk
Related Issues
Status	accepted	Assigned To
Milestone

Created on 2022-04-12.14:49:18 by bfrk, last changed 2023-06-25.16:40:16 by bfrk.

Files
File name	Status	Uploaded	Type	Edit	Remove
OpenPGP_0xD36E45316E58CC97.asc		bfrk, 2023-06-25.16:40:16	application/pgp-keys
patch-preview.txt		bfrk, 2022-04-12.14:49:17	text/x-darcs-patch
resolve-issue1819_-external_merge-and-no_allow_conflicts.dpatch		bfrk, 2022-04-12.14:49:17	application/x-darcs-patch

See mailing list archives for discussion on individual patches.

Messages
msg22972 (view)	Author: bfrk	Date: 2022-04-12.14:49:17
1 patch for repository http://darcs.net/screened: patch becf205173637204bf049ef4d67f1432f4d212e1 Author: Ben Franksen <ben.franksen@online.de> Date: Tue Apr 12 16:32:40 CEST 2022 * resolve issue1819: external-merge and no-allow-conflicts The fix is simply to remove the code that deliberately tests for the external-merge option before failing in announceConflicts. Attachments patch-preview.txt resolve-issue1819_-external_merge-and-no_allow_conflicts.dpatch
msg23379 (view)	Author: ganesh	Date: 2023-06-24.15:06:07
Looks fine. I wonder if the external-merge option should really be part of the same group as mark/allow/dont-allow/skip conflicts. Regardless, this patch is an improvement over the previous state of affairs.
msg23421 (view)	Author: bfrk	Date: 2023-06-25.16:40:16
> I wonder if the external-merge option should really be part of the > same group as mark/allow/dont-allow/skip conflicts. See patch2320 Attachments OpenPGP_0xD36E45316E58CC97.asc

History
Date	User	Action	Args
2022-04-12 14:49:18	bfrk	create
2022-04-14 10:30:08	bfrk	set	status: needs-screening -> needs-review
2023-06-24 15:06:07	ganesh	set	status: needs-review -> accepted-pending-tests messages: + msg23379
2023-06-24 16:16:12	ganesh	set	status: accepted-pending-tests -> accepted
2023-06-25 16:40:16	bfrk	set	files: + OpenPGP_0xD36E45316E58CC97.asc messages: + msg23421