Issue 113: Rename resolve command to mark-conflicts - Darcs bug tracker

Title	Rename resolve command to mark-conflicts
Priority	feature	Status	resolved
Milestone		Resolved in
Superseder		Nosy List	darcs-devel, dmitry.kurochkin, kowey, thorkilnaur, tommy, zooko
Assigned To	kowey	Topics	ProbablyEasy

Created on 2006-01-26.05:47:35 by zooko, last changed 2009-08-27.14:10:42 by admin.

Messages
msg423 (view)	Author: zooko	Date: 2006-01-26.05:47:34
As per this thread: http://article.gmane.org/gmane.comp.version-control.darcs.user/9219 alternate URL: http://www.abridgegame.org/pipermail/darcs-users/2006-January/009312.html The command "darcs resolve" would be better named "darcs mark-conflicts". Regards, Zooko
msg427 (view)	Author: droundy	Date: 2006-01-26.13:58:50
On Thu, Jan 26, 2006 at 05:47:36AM +0000, Zooko wrote: > The command "darcs resolve" would be better named "darcs mark-conflicts". Hmmmm. That certainly does sound like an improvement to me. I didn't see this suggestion on the thread you quoted, so before making this change it would be nice to see it aired as a proposal on darcs-users, to make sure noone sees an objection. It's a sufficiently obscure and rarely-used command that I think we can be freer with renaming it than we would normally be. -- David Roundy http://www.darcs.net
msg861 (view)	Author: kowey	Date: 2006-08-06.09:12:51
Just for the record, there did not seem to be any objections on darcs-users: http://comments.gmane.org/gmane.comp.version-control.darcs.user/9289
msg865 (view)	Author: droundy	Date: 2006-08-07.11:06:57
Sounds good to me. David
msg1902 (view)	Author: kowey	Date: 2007-07-23.06:45:27
Resolved in unstable with the following patch. Thanks! Tue Jul 17 00:56:35 CEST 2007 Eric Kow <eric.kow@loria.fr> * Rename resolve to mark-conflicts (issue113).

History
Date	User	Action	Args
2006-01-26 05:47:35	zooko	create
2006-01-26 13:58:50	droundy	set	status: unread -> unknown nosy: droundy, tommy, zooko messages: + msg427
2006-01-31 13:19:30	droundy	set	nosy: droundy, tommy, zooko
2006-08-06 09:12:54	kowey	set	topic: + ProbablyEasy nosy: + kowey messages: + msg861
2006-08-07 11:07:01	droundy	set	nosy: droundy, tommy, kowey, zooko messages: + msg865
2006-08-07 14:03:28	kowey	set	nosy: droundy, tommy, kowey, zooko title: The name "darcs resolve" is confusing. -> Rename resolve command to mark-conflicts
2007-07-21 21:10:19	kowey	set	nosy: + beschmi
2007-07-23 06:45:28	kowey	set	status: unknown -> resolved-in-unstable nosy: kowey, zooko, droundy, tommy, beschmi messages: + msg1902
2007-07-31 17:57:29	kowey	set	status: resolved-in-unstable -> resolved-in-stable
2008-09-16 21:30:07	admin	set	status: resolved-in-stable -> resolved nosy: + dagit
2009-08-06 17:46:35	admin	set	nosy: + markstos, jast, Serware, dmitry.kurochkin, darcs-devel, mornfall, simon, thorkilnaur, - droundy
2009-08-06 20:42:16	admin	set	nosy: - beschmi
2009-08-10 21:43:09	admin	set	nosy: - markstos, darcs-devel, jast, Serware, mornfall
2009-08-10 23:48:05	admin	set	nosy: - dagit
2009-08-25 17:58:23	admin	set	nosy: + darcs-devel, - simon
2009-08-27 14:10:42	admin	set	nosy: tommy, kowey, darcs-devel, zooko, thorkilnaur, dmitry.kurochkin