Issue 677: pull conflicts with unrecorded changes - Darcs bug tracker

Title	pull conflicts with unrecorded changes
Priority	wishlist	Status	resolved
Milestone		Resolved in
Superseder		Nosy List	amber, darcs-devel, dmitry.kurochkin, ertai, kowey, markstos, thorkilnaur, tommy
Assigned To		Topics

Created on 2008-02-11.19:30:15 by amber, last changed 2009-10-24.00:05:45 by admin.

Messages
msg3334 (view)	Author: amber	Date: 2008-02-11.19:30:14
Hello. If I pull and there are unrecorded changes in my current repository and I get conflicts, then I don't know how to go back. I wish there were a darcs command to make it go back to how it was before I pulled. Thank you! -Amber \ L. Amber Wilcox-O'Hearn * http://www.cs.toronto.edu/~amber/ / -\ Graduate student * Computational Linguistics Research Group /- --\ Department of Computer Science * University of Toronto /--
msg3335 (view)	Author: ertai	Date: 2008-02-11.20:35:42
Hello, > If I pull and there are unrecorded changes in my current repository and I get > conflicts, then I don't know how to go back. I wish there were a darcs command > to make it go back to how it was before I pulled. With darcs2 you can give --dont-allow-conflicts to pull, and so avoid to be in such a case in the first place. Best regards,
msg3347 (view)	Author: markstos	Date: 2008-02-12.00:28:18
You can also always record a patch before you pull, and then unrecord the patch afterwards. I'm tentatively marking this as resolved-in-unstable, since I consider these options sufficient. Another contributor is welcome to re-open the issue. Mark

History
Date	User	Action	Args
2008-02-11 19:30:15	amber	create
2008-02-11 20:35:44	ertai	set	status: unread -> unknown nosy: + darcs-devel, ertai messages: + msg3335
2008-02-12 00:28:19	markstos	set	priority: wishlist status: unknown -> resolved-in-unstable messages: + msg3347 nosy: + amber, markstos, - amber
2008-02-16 22:58:53	markstos	link	issue676 superseder
2008-09-04 21:32:31	admin	set	status: resolved-in-unstable -> resolved nosy: + dagit
2009-08-06 17:54:13	admin	set	nosy: + jast, Serware, dmitry.kurochkin, zooko, mornfall, simon, thorkilnaur, - droundy, ertai, amber
2009-08-06 20:57:45	admin	set	nosy: - beschmi
2009-08-10 22:14:50	admin	set	nosy: + amber, ertai, - zooko, jast, Serware, mornfall
2009-08-11 00:06:53	admin	set	nosy: - dagit
2009-08-25 18:05:34	admin	set	nosy: - simon
2009-08-27 14:08:55	admin	set	nosy: tommy, kowey, markstos, darcs-devel, thorkilnaur, ertai, amber, dmitry.kurochkin
2009-10-23 22:40:44	admin	set	nosy: + nicolas.pouillard, - ertai
2009-10-24 00:05:45	admin	set	nosy: + ertai, - nicolas.pouillard