darcs

Issue 2697 amend --unrecord should move unrecorded changes to pending

Title amend --unrecord should move unrecorded changes to pending
Priority Status resolved
Milestone Resolved in 2.18.1
Superseder Nosy List bfrk
Assigned To
Topics

Created on 2023-02-20.19:18:10 by bfrk, last changed 2023-06-24.20:29:45 by noreply.

Messages
msg23113 (view) Author: bfrk Date: 2023-02-20.19:18:08
Changes like replace, addfile, etc are currently not preserved in 
pending but discarded. This is especially bad when unrecording 
replace patches, since they are not so easy to restore.

I wasn't able to track this one down, other than that it worked in 
darcs-2.14, but no longer in darcs-2.16.

Here is a simple test:

darcs init
echo bla > bla
darcs record -lam 'bla'
echo yyy | darcs amend --unrecord -a bla
darcs whatsnew > new
grep 'addfile ./bla' new
msg23118 (view) Author: bfrk Date: 2023-02-21.20:22:09
A fix for this is now in screened.
msg23119 (view) Author: bfrk Date: 2023-02-21.20:23:07
see patch2278
msg23406 (view) Author: noreply Date: 2023-06-24.20:29:39
The following patch sent by Ben Franksen <ben.franksen@online.de> updated issue issue2697 with
status=resolved;resolvedin=2.18.1

Hash: 8d436f51c364ba70ef4f7e93b39554ed20f6662a
Author: Ben Franksen <ben.franksen@online.de>
* resolve issue2697: amend --unrecord should move unrecorded changes to pending
History
Date User Action Args
2023-02-20 19:18:10bfrkcreate
2023-02-21 20:22:09bfrksetstatus: unknown -> has-patch
messages: + msg23118
2023-02-21 20:23:07bfrksetmessages: + msg23119
2023-03-27 14:58:06bfrksetstatus: has-patch -> resolved
2023-06-24 20:29:45noreplysetmessages: + msg23406
resolvedin: 2.18.1