Patch 611: Accept issue2066: file does not exist wh... (and 1 more) - Darcs bug tracker

Title	Accept issue2066: file does not exist wh... (and 1 more)
Superseder		Nosy List	stulli
Related Issues	darcs record fails when deleted file and added file are specified on the command line View: 2066
Status	accepted	Assigned To
Milestone

Created on 2011-05-23.08:53:19 by stulli, last changed 2012-01-15.16:04:57 by ganesh. Tracked on DarcsWatch.

Files
File name	Status	Uploaded	Type	Edit	Remove
accept-issue2066_-file-does-not-exist-when-recording-deleted-file.dpatch		stulli, 2011-05-23.08:53:18	text/x-darcs-patch
patch-preview.txt		ganesh, 2012-01-15.15:53:13	text/x-darcs-patch
rename-amend_record_s-__rollback-option-to-__unrecord.dpatch		ganesh, 2012-01-15.15:53:13	application/x-darcs-patch
unnamed		stulli, 2011-05-23.08:53:18
unnamed		ganesh, 2012-01-15.15:53:13

See mailing list archives for discussion on individual patches.

Messages
msg14458 (view)	Author: stulli	Date: 2011-05-23.08:53:18
2 patches for repository http://darcs.net/screened: Mon May 23 00:41:48 CEST 2011 andreas.brandt.de@googlemail.com * Accept issue2066: file does not exist when recording deleted file Mon May 23 01:11:28 CEST 2011 andreas.brandt.de@googlemail.com * resolve issue2066: file does not exist when recording deleted file Attachments accept-issue2066_-file-does-not-exist-when-recording-deleted-file.dpatch unnamed
msg14482 (view)	Author: ganesh	Date: 2011-06-03.06:05:40
I'm going to push this to screened, but it still needs a full review. Some preliminary comments: I'm not entirely convinced that the code change (to reading recorded rather than recorded+pending) is always correct; we should write some more tests for various scenarios. Still, the test case clearly demonstrates a bug, and we don't have any other existing tests that are broken, so the patch does move things forward. The variable in_pending later on in the same function should be renamed as it's no longer correct.
msg14484 (view)	Author: darcswatch	Date: 2011-06-03.06:15:18
This patch bundle (with 2 patches) was just applied to the repository http://darcs.net/screened. This message was brought to you by DarcsWatch http://darcswatch.nomeata.de/repo_http:__darcs.net_screened.html#bundle-941192462060ea12db569a5f461bcf0e6311fca0
msg14885 (view)	Author: ganesh	Date: 2011-12-28.22:41:08
I'm accepting this (with a followup to rename in_pending to in_pristine) as it doesn't break any existing tests and I don't have time to think through all the alternatives. If it leads to further bugs then we can add more tests and hopefully use those to design a better fix.
msg14887 (view)	Author: darcswatch	Date: 2011-12-28.22:44:32
This patch bundle (with 2 patches) was just applied to the repository http://darcs.net/reviewed. This message was brought to you by DarcsWatch http://darcswatch.nomeata.de/repo_http:__darcs.net_reviewed.html#bundle-941192462060ea12db569a5f461bcf0e6311fca0
msg15019 (view)	Author: ganesh	Date: 2012-01-15.15:53:13
A couple of follow-ups as discussed. I'll self accept fairly soon if no comments. 2 patches for repository /home/ganesh/darcs/darcs-temp: Mon Jan 9 18:09:46 GMT 2012 Ganesh Sittampalam <ganesh@earth.li> * rename amend-record's --rollback option to --unrecord Fri Jan 13 23:36:12 GMT 2012 Ganesh Sittampalam <ganesh@earth.li> * fill out options for amend-record --unrecord and add test - interactive hunk edit - selecting files Attachments patch-preview.txt rename-amend_record_s-__rollback-option-to-__unrecord.dpatch unnamed
msg15021 (view)	Author: ganesh	Date: 2012-01-15.16:04:57
Sorry, the last message was intended for patch661!

History
Date	User	Action	Args
2011-05-23 08:53:19	stulli	create
2011-05-23 08:53:51	darcswatch	set	darcswatchurl: http://darcswatch.nomeata.de/repo_http:__darcs.net_reviewed.html#bundle-941192462060ea12db569a5f461bcf0e6311fca0
2011-06-03 06:05:40	ganesh	set	status: needs-screening -> needs-review messages: + msg14482
2011-06-03 06:15:18	darcswatch	set	messages: + msg14484
2011-12-27 21:54:40	ganesh	set	issues: + darcs record fails when deleted file and added file are specified on the command line
2011-12-28 22:41:08	ganesh	set	status: needs-review -> accepted-pending-tests messages: + msg14885
2011-12-28 22:44:32	darcswatch	set	status: accepted-pending-tests -> accepted messages: + msg14887
2012-01-15 15:53:13	ganesh	set	files: + patch-preview.txt, rename-amend_record_s-__rollback-option-to-__unrecord.dpatch, unnamed messages: + msg15019
2012-01-15 16:04:57	ganesh	set	messages: + msg15021