Issue 294: Change handling of conflicts to keep track of auto resolutions - Darcs bug tracker

Title	Change handling of conflicts to keep track of auto resolutions
Priority	wishlist	Status	resolved
Milestone		Resolved in
Superseder		Nosy List	darcs-devel, dmitry.kurochkin, kowey, markstos, thorkilnaur, tommy
Assigned To		Topics	Conflicts

Created on 2006-10-12.19:38:50 by kowey, last changed 2009-08-27.14:05:23 by admin.

Messages
msg1071 (view)	Author: kowey	Date: 2006-10-12.19:38:41
droundy 2004-11-07 ------------------ From TODO: Change handling of conflicts to keep track of auto resolutions This is so sequential pulls can't cause trouble in the working directory.
msg1072 (view)	Author: kowey	Date: 2006-10-12.19:40:27
(This was an import of RT #42) I have no idea what this means. I would suggest that David explain to us what this means (when he is less busy), and if it still relevant.
msg3269 (view)	Author: markstos	Date: 2008-02-09.18:19:59
David, I'm not sure what you meant by this old TODO item either, but it sounds like something that would have been addressed by the updated conflicts handling code, so I'm marking it as "resolved-in-unstable". Please re-open if I've guessed wrong.

History
Date	User	Action	Args
2006-10-12 19:38:50	kowey	create
2006-10-12 19:40:37	kowey	set	status: unread -> unknown nosy: droundy, tommy, kowey messages: + msg1072
2007-07-23 14:07:22	kowey	set	topic: - FromRequestTracker nosy: + beschmi
2008-02-09 18:20:00	markstos	set	status: unknown -> resolved-in-unstable nosy: + markstos messages: + msg3269
2008-09-04 21:29:31	admin	set	status: resolved-in-unstable -> resolved nosy: + dagit
2009-08-06 17:47:29	admin	set	nosy: + jast, Serware, dmitry.kurochkin, darcs-devel, zooko, mornfall, simon, thorkilnaur, - droundy
2009-08-06 20:43:19	admin	set	nosy: - beschmi
2009-08-10 21:56:40	admin	set	nosy: - darcs-devel, zooko, jast, Serware, mornfall
2009-08-10 23:56:46	admin	set	nosy: - dagit
2009-08-25 17:59:14	admin	set	nosy: + darcs-devel, - simon
2009-08-27 14:05:23	admin	set	nosy: tommy, kowey, markstos, darcs-devel, thorkilnaur, dmitry.kurochkin