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

Title	pull conflicts with unrecorded changes
Priority	bug	Status	wont-fix
Milestone		Resolved in
Superseder	pull conflicts with unrecorded changes View: 677	Nosy List	amber, darcs-devel, dmitry.kurochkin, kowey, markstos, thorkilnaur, tommy
Assigned To		Topics

Created on 2008-02-11.19:30:15 by amber, last changed 2009-08-27.13:55:47 by admin.

Messages
msg3333 (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 /--
msg3351 (view)	Author: markstos	Date: 2008-02-12.01:42:28
Dupe.

History
Date	User	Action	Args
2008-02-11 19:30:15	amber	create
2008-02-12 01:42:29	markstos	set	priority: bug nosy: + amber, markstos, - amber status: unread -> unknown messages: + msg3351
2008-02-16 22:56:27	markstos	link	issue675 superseder
2008-02-16 22:58:53	markstos	set	status: unknown -> wont-fix nosy: droundy, tommy, beschmi, kowey, markstos, amber superseder: + pull conflicts with unrecorded changes
2009-08-06 17:54:11	admin	set	nosy: + jast, Serware, dmitry.kurochkin, darcs-devel, zooko, dagit, mornfall, simon, thorkilnaur, - droundy, amber
2009-08-06 20:57:43	admin	set	nosy: - beschmi
2009-08-10 22:14:48	admin	set	nosy: + amber, - darcs-devel, zooko, jast, dagit, Serware, mornfall
2009-08-25 18:05:32	admin	set	nosy: + darcs-devel, - simon
2009-08-27 13:55:47	admin	set	nosy: tommy, kowey, markstos, darcs-devel, thorkilnaur, amber, dmitry.kurochkin