Issue 1958: conflict marking order is not consistent - Darcs bug tracker

Title	conflict marking order is not consistent
Priority	invalid	Status	resolved
Milestone		Resolved in
Superseder		Nosy List	dmitry.kurochkin, kowey
Assigned To		Topics	Conflicts, UI

Created on 2010-09-19.08:04:37 by kowey, last changed 2021-01-30.13:33:10 by bfrk.

Messages
msg12587 (view)	Author: kowey	Date: 2010-09-19.08:04:35
Forked off issue833. Could I get an investigation and explanation for why this is the case? I imagine it has something to do with conflict marking being done on a primitives level, but why do the sides get flipped around? Might be an easier milestone than issue833
msg22375 (view)	Author: bfrk	Date: 2020-08-02.00:17:01
Indeed this needs a concrete counter-example. I have observed that the order is different between patch formats, but since these are completely different implementations this is not too surprising and not a problem in practice. I am minded to close this as "works-for-me" (but we don't have a status for that).
msg22631 (view)	Author: bfrk	Date: 2021-01-30.13:33:06
This bug does not exist, it's just been a hunch.

History
Date	User	Action	Args
2010-09-19 08:04:37	kowey	create
2020-08-02 00:17:04	bfrk	set	messages: + msg22375
2021-01-30 13:33:10	bfrk	set	priority: bug -> invalid status: needs-reproduction -> resolved messages: + msg22631