Patch 1577: added a comment to Darcs.Patch.Conflict.resolveConflicts (and one more) - Darcs bug tracker

Title	added a comment to Darcs.Patch.Conflict.resolveConflicts (and one more)
Superseder		Nosy List	bfrk, ganesh
Related Issues
Status	accepted	Assigned To	bfrk
Milestone

Created on 2017-08-12.09:51:21 by bfrk, last changed 2017-08-20.15:25:21 by gh.

Files
File name	Status	Uploaded	Type	Edit	Remove
added-a-comment-to-darcs_patch_conflict_resolveconflicts.dpatch		bfrk, 2017-08-12.09:51:20	application/x-darcs-patch

See mailing list archives for discussion on individual patches.

Messages
msg19613 (view)	Author: gh	Date: 2017-08-20.15:11:08
OK for the comment, but the second patch looks really suspicious to me. It seems like in the definition of 'rcs' the case where (resolveConflicts p) is null and the alternative case have been inverted? I would suggest rollback this patch in screened ASAP.
msg19616 (view)	Author: gh	Date: 2017-08-20.15:25:21
Sorry, the patch is correct. I failed to see that the top case used to be non-empty, now the bottom case is. Accepted

History
Date	User	Action	Args
2017-08-12 09:51:21	bfrk	create
2017-08-13 13:31:49	bfrk	set	status: needs-screening -> needs-review
2017-08-20 15:11:09	gh	set	status: needs-review -> followup-requested nosy: + ganesh, bfrk messages: + msg19613 assignedto: bfrk
2017-08-20 15:25:21	gh	set	status: followup-requested -> accepted messages: + msg19616