Patch 2338: mark-conflicts: report unmangled conflicts only if the... - Darcs bug tracker

Title	mark-conflicts: report unmangled conflicts only if the...
Superseder		Nosy List	bfrk
Related Issues
Status	accepted	Assigned To
Milestone

Created on 2023-07-29.09:45:35 by bfrk, last changed 2023-07-29.11:27:26 by ganesh.

Files
File name	Status	Uploaded	Type	Edit	Remove
mark_conflicts_-report-unmangled-conflicts-only-if-they-affect-the-specified-paths.dpatch		bfrk, 2023-07-29.09:45:35	application/x-darcs-patch
patch-preview.txt		bfrk, 2023-07-29.09:45:34	text/x-darcs-patch

See mailing list archives for discussion on individual patches.

Messages
msg23638 (view)	Author: bfrk	Date: 2023-07-29.09:45:35
1 patch for repository http://darcs.net/screened: patch 2741fa2f6c730b3a065f3bbd35b42c93f57d8fb5 Author: Ben Franksen <ben.franksen@online.de> Date: Wed Jul 5 13:44:34 CEST 2023 * mark-conflicts: report unmangled conflicts only if they affect the specified paths This was marked as FIXME in a comment. Attachments mark_conflicts_-report-unmangled-conflicts-only-if-they-affect-the-specified-paths.dpatch patch-preview.txt
msg23642 (view)	Author: ganesh	Date: 2023-07-29.11:18:54
looks good (theoretically could do with a test but it's very minor)

History
Date	User	Action	Args
2023-07-29 09:45:35	bfrk	create
2023-07-29 09:49:23	bfrk	set	status: needs-screening -> needs-review
2023-07-29 11:18:54	ganesh	set	status: needs-review -> accepted-pending-tests messages: + msg23642
2023-07-29 11:27:26	ganesh	set	status: accepted-pending-tests -> accepted