Issue 120: I wish I could do "darcs pull --allow-conflicts". - Darcs bug tracker

Title	I wish I could do "darcs pull --allow-conflicts".
Priority	wishlist	Status	resolved
Milestone		Resolved in
Superseder		Nosy List	darcs-devel, dmitry.kurochkin, kowey, markstos, thorkilnaur, tommy, zooko
Assigned To		Topics	ProbablyEasy

Created on 2006-01-30.17:06:42 by zooko, last changed 2009-08-27.14:02:10 by admin.

Messages
msg445 (view)	Author: zooko	Date: 2006-01-30.17:06:41
I need this for my two-way-sync script between darcs and svn. Currently I work around it by doing "darcs pull ; darcs revert --all" to erase the conflict markers.
msg2876 (view)	Author: markstos	Date: 2008-01-30.01:04:36
I checked tonight that will --allow-conflicts is missing in 1.0.9, it is present in Darcs2, so I'm marking this as "resolved-in-unstable".

History
Date	User	Action	Args
2006-01-30 17:06:42	zooko	create
2006-01-31 13:19:05	droundy	set	nosy: droundy, tommy, zooko
2006-08-06 22:13:43	kowey	set	topic: + ProbablyEasy nosy: droundy, tommy, zooko
2008-01-30 01:04:37	markstos	set	status: unread -> resolved-in-unstable nosy: + markstos, kowey, beschmi messages: + msg2876
2008-08-05 23:28:53	kowey	set	status: resolved-in-unstable -> resolved nosy: + dagit
2009-08-06 17:50:11	admin	set	nosy: + jast, Serware, dmitry.kurochkin, darcs-devel, mornfall, simon, thorkilnaur, - droundy
2009-08-06 20:48:38	admin	set	nosy: - beschmi
2009-08-10 21:43:29	admin	set	nosy: - darcs-devel, jast, Serware, mornfall
2009-08-10 23:50:54	admin	set	nosy: - dagit
2009-08-25 18:01:33	admin	set	nosy: + darcs-devel, - simon
2009-08-27 14:02:10	admin	set	nosy: tommy, kowey, markstos, darcs-devel, zooko, thorkilnaur, dmitry.kurochkin