Issue 588: amend-record --look-for-adds end up with two "addfile" entries - Darcs bug tracker

Title	amend-record --look-for-adds end up with two "addfile" entries
Priority	urgent	Status	resolved
Milestone		Resolved in
Superseder		Nosy List	darcs-devel, dmitry.kurochkin, ertai, kowey, thorkilnaur, tommy
Assigned To		Topics

Created on 2008-01-15.13:56:39 by ertai, last changed 2009-10-24.00:05:37 by admin.

Files
File name	Uploaded	Type	Edit	Remove
issue588	droundy, 2008-01-15.15:40:38	text/plain
issue588	droundy, 2008-01-15.15:46:29	text/plain
test6.sh	ertai, 2008-01-15.13:56:34	application/octet-stream

Messages
msg2518 (view)	Author: ertai	Date: 2008-01-15.13:56:34
This tests leads to a patch with two consecutive addfile ./f, then one cannot unrecord the patch. darcs 1 and 2 are affected, in both old-fashioned and hashed formats. $ ./test6.sh Finished recording patch 'p1' Tue Jan 15 14:50:32 CET 2008 nicolas.pouillard@gmail.com * p1 Shall I amend this patch? [yNvpxq], or ? for help: hunk ./f 1 -foo Shall I add this change? (1/?) [ynWsfvpxdaqjkc], or ? for help: rmfile ./f Shall I add this change? (2/?) [ynWsfvpxdaqjkc], or ? for help: Finished amending patch: Tue Jan 15 14:50:32 CET 2008 nicolas.pouillard@gmail.com * p1 Tue Jan 15 14:50:32 CET 2008 nicolas.pouillard@gmail.com * p1 addfile ./f show the buggy pending addfile ./f Tue Jan 15 14:50:32 CET 2008 nicolas.pouillard@gmail.com * p1 Shall I amend this patch? [yNvpxq], or ? for help: Finished amending patch: Tue Jan 15 14:50:32 CET 2008 nicolas.pouillard@gmail.com * p1 Tue Jan 15 14:50:32 CET 2008 nicolas.pouillard@gmail.com * p1 { addfile ./f addfile ./f hunk ./f 1 +bar } Attachments test6.sh
msg2520 (view)	Author: droundy	Date: 2008-01-15.15:40:38
Thanks for this test! I'm attaching a darcs patch adding your test case to the test suite (with a bit of massaging). -- David Roundy Department of Physics Oregon State University Attachments issue588
msg2521 (view)	Author: droundy	Date: 2008-01-15.15:46:29
Thanks for this test! I'm attaching a darcs patch adding your test case to the test suite (with a bit of massaging). -- David Roundy Department of Physics Oregon State University Attachments issue588
msg2530 (view)	Author: droundy	Date: 2008-01-15.19:35:27
I've just pushed a fix for this (along with the test). Thanks! David

History
Date	User	Action	Args
2008-01-15 13:56:40	ertai	create
2008-01-15 15:40:42	droundy	set	files: + issue588 status: unread -> unknown messages: + msg2520
2008-01-15 15:46:30	droundy	set	files: + issue588 messages: + msg2521
2008-01-15 19:35:29	droundy	set	status: unknown -> resolved messages: + msg2530
2008-01-21 02:46:36	markstos	set	nosy: droundy, tommy, beschmi, kowey, ertai title: Another issue with amend-record --look-for-adds -> amend-record --look-for-adds end up with two "addfile" entries
2009-08-06 17:36:08	admin	set	nosy: + markstos, jast, Serware, dmitry.kurochkin, darcs-devel, zooko, dagit, mornfall, simon, thorkilnaur, - droundy, ertai
2009-08-06 20:33:14	admin	set	nosy: - beschmi
2009-08-10 22:10:49	admin	set	nosy: + ertai, - markstos, darcs-devel, zooko, jast, dagit, Serware, mornfall
2009-08-25 17:50:11	admin	set	nosy: + darcs-devel, - simon
2009-08-27 13:52:57	admin	set	nosy: tommy, kowey, darcs-devel, thorkilnaur, ertai, dmitry.kurochkin
2009-10-23 22:40:39	admin	set	nosy: + nicolas.pouillard, - ertai
2009-10-24 00:05:37	admin	set	nosy: + ertai, - nicolas.pouillard