Issue 675: Unexpected conflict - Darcs bug tracker

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

Created on 2008-02-11.19:25:56 by amber, last changed 2009-08-27.13:55:45 by admin.

Messages
msg3331 (view)	Author: amber	Date: 2008-02-11.19:25:55
I had a file with line x in it. In one repository, I added several lines after line x. In another repository I changed line x. When I pulled the change of line x, the added lines were considered a conflict. This may be a tricky problem, but it just wasn't what I expected. 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 /--
msg3343 (view)	Author: markstos	Date: 2008-02-12.00:06:45
Dupe.

History
Date	User	Action	Args
2008-02-11 19:25:57	amber	create
2008-02-12 00:06:46	markstos	set	priority: bug nosy: + amber, markstos, - amber status: unread -> unknown messages: + msg3343
2008-02-16 22:56:27	markstos	set	status: unknown -> wont-fix nosy: droundy, tommy, beschmi, kowey, markstos, amber superseder: + pull conflicts with unrecorded changes
2009-08-06 17:54:08	admin	set	nosy: + jast, Serware, dmitry.kurochkin, darcs-devel, zooko, dagit, mornfall, simon, thorkilnaur, - droundy, amber
2009-08-06 20:57:41	admin	set	nosy: - beschmi
2009-08-10 22:14:46	admin	set	nosy: + amber, - darcs-devel, zooko, jast, dagit, Serware, mornfall
2009-08-25 18:05:29	admin	set	nosy: + darcs-devel, - simon
2009-08-27 13:55:45	admin	set	nosy: tommy, kowey, markstos, darcs-devel, thorkilnaur, amber, dmitry.kurochkin