Issue 1699: Another one: mergeConflictingNons failed in geteff with ix - Darcs bug tracker

Title	Another one: mergeConflictingNons failed in geteff with ix
Priority	urgent	Status	given-up
Milestone		Resolved in
Superseder		Nosy List	darcs-devel, de0u, dmitry.kurochkin, kowey
Assigned To	de0u	Topics	Conflicts

Created on 2009-11-22.07:08:44 by de0u, last changed 2017-07-30.23:41:19 by gh.

Files
File name	Uploaded	Type	Edit	Remove
issue1699.txt	de0u, 2009-11-22.07:11:51	text/plain

Messages
msg9443 (view)	Author: de0u	Date: 2009-11-22.07:08:40
This happens with "2.2.0 (release)" and "2.3.1 (release)", so I don't think it's a duplicate of issue #1043 or #1198. Eyeballing the output, I'm really not sure what the conflict might be...help!?!? Attachments darcs
msg9444 (view)	Author: de0u	Date: 2009-11-22.07:11:51
Maybe if I call the error message file ".txt" it'll have a less-scary MIME type? Attachments issue1699.txt
msg9447 (view)	Author: kowey	Date: 2009-11-22.08:12:16
Yikes! Any chance at all you could make the repository available to us (even if privately) so that we could boil it down into a minimal test case? In the mean time: you need a workaround. Unfortunately, I think that means (1) using Darcs to merge in all patches that don't affect the file ./410kern/simics/simics.h (2) using diff+patch for the rest :-(
msg9593 (view)	Author: kowey	Date: 2009-12-11.11:34:26
Just an update on this: Dave has very kindly agreed to take on some forensics as described in http://wiki.darcs.net/Forensics when he has a spare moment (which may not be for another couple of weeks or so).

History
Date	User	Action	Args
2009-11-22 07:08:44	de0u	create
2009-11-22 07:11:54	de0u	set	files: + issue1699.txt messages: + msg9444
2009-11-22 07:12:19	de0u	set	files: - darcs
2009-11-22 08:12:18	kowey	set	status: needs-reproduction -> waiting-for nosy: + kowey messages: + msg9447 assignedto: de0u
2009-12-11 11:34:30	kowey	set	messages: + msg9593
2017-07-30 23:41:19	gh	set	status: waiting-for -> given-up