Issue 552: darcs changes --summary does not show mergers deep enough - Darcs bug tracker

Title	darcs changes --summary does not show mergers deep enough
Priority	bug	Status	resolved
Milestone		Resolved in
Superseder		Nosy List	darcs-devel, dmitry.kurochkin, kowey, ppessi, thorkilnaur, tommy
Assigned To		Topics

Created on 2007-10-26.11:38:55 by ppessi, last changed 2009-08-27.14:07:32 by admin.

Files
File name	Uploaded	Type	Edit	Remove
changes-summary-failure.zip	ppessi, 2007-10-26.11:38:54	application/zip
d2.tar.gz	ppessi, 2008-01-09.04:29:29	application/x-gzip
h2	ppessi, 2008-01-09.04:29:29	application/octet-stream

Messages
msg2177 (view)	Author: ppessi	Date: 2007-10-26.11:38:54
darcs changes --summary does not show files involved in three-way or deeper merger conflict (there is no M line at all). Tested with 1.0.9 and currentish darcs-stable. A zip file containing an example repository and exact-version from darcs-stable is included. Attachments changes-summary-failure.zip
msg2324 (view)	Author: droundy	Date: 2008-01-05.15:32:56
I believe this bug is resolved in unstable, since we've changed how we report conflicts. I'm certain it's not present in the darcs-2 format. Tests to confirm this would be welcome. David
msg2393 (view)	Author: ppessi	Date: 2008-01-09.04:29:29
2008/1/5, David Roundy <bugs@darcs.net>: > I believe this bug is resolved in unstable, since we've changed how we report > conflicts. I'm certain it's not present in the darcs-2 format. I guess this is true if you mean that the bug with mergers does not affect darcs-2 as darcs-2 does not show conflictors deep enough. >Tests to confirm this would be welcome. Sorry. A script making hairy conflicts and a bunch of resulting repos is attached. See d2/R6 for an example. Attachments d2.tar.gz h2
msg2404 (view)	Author: daveroundy	Date: 2008-01-09.20:48:59
I'm working on this now. Thanks for the bug report!
msg2405 (view)	Author: daveroundy	Date: 2008-01-09.20:49:15
I'm working on this now. Thanks for the bug report!
msg2411 (view)	Author: droundy	Date: 2008-01-10.20:08:52
I believe this now really is fixed in darcs-unstable. Thanks for being persistent! David

History
Date	User	Action	Args
2007-10-26 11:38:56	ppessi	create
2008-01-05 15:32:57	droundy	set	status: unread -> resolved-in-unstable messages: + msg2324
2008-01-09 04:29:31	ppessi	set	files: + h2, d2.tar.gz messages: + msg2393
2008-01-09 20:49:00	daveroundy	set	nosy: + daveroundy messages: + msg2404
2008-01-09 20:49:16	daveroundy	set	messages: + msg2405
2008-01-10 20:08:57	droundy	set	messages: + msg2411
2008-09-04 21:31:33	admin	set	status: resolved-in-unstable -> resolved nosy: + dagit
2008-09-28 20:49:42	admin	set	nosy: + simon, thorkilnaur, - daveroundy
2009-08-06 17:42:09	admin	set	nosy: + markstos, jast, Serware, dmitry.kurochkin, darcs-devel, zooko, mornfall, - droundy, ppessi
2009-08-06 20:39:16	admin	set	nosy: - beschmi
2009-08-10 22:09:14	admin	set	nosy: + ppessi, - markstos, darcs-devel, zooko, jast, Serware, mornfall
2009-08-11 00:03:02	admin	set	nosy: - dagit
2009-08-25 17:26:21	admin	set	nosy: + darcs-devel, - simon
2009-08-27 14:07:32	admin	set	nosy: tommy, kowey, darcs-devel, ppessi, thorkilnaur, dmitry.kurochkin