darcs

Issue 1481 darcs record gets confused by move and add of the same file

Title darcs record gets confused by move and add of the same file
Priority bug Status given-up
Milestone Resolved in
Superseder Nosy List darcs-devel, dmitry.kurochkin, kowey, nwf, thorkilnaur
Assigned To kowey
Topics

Created on 2009-06-17.21:59:51 by nwf, last changed 2017-07-30.23:43:35 by gh.

Messages
msg7915 (view) Author: nwf Date: 2009-06-17.21:59:47
I have a source tree in which I have moved a file, changed it, and added a file
back at the old name:

$ darcs w -s
./src/joshua/e2e/scripts/joshua/AlignedSubsampler.java ->
./src/joshua/e2e/scripts/joshua/Subsampler.java
A ./src/joshua/e2e/scripts/joshua/AlignedSubsampler.java
M ./src/joshua/e2e/scripts/joshua/Subsampler.java -16 +20

If I feed this to record with no files specified, it asks about 13 changes:

$ darcs record
move ./src/joshua/e2e/scripts/joshua/AlignedSubsampler.java
./src/joshua/e2e/scripts/joshua/Subsampler.java
Shall I record this change? (1/13)  [ynWvplxdaqjk], or ? for help: 

If I give the files by name (in either order), it only asks about 11.  The two
missing questions are about the addfile and the hunk for the file's contents.

$ darcs record ./src/joshua/e2e/scripts/joshua/AlignedSubsampler.java
./src/joshua/e2e/scripts/joshua/Subsampler.java
Recording changes in "src/joshua/e2e/scripts/joshua/AlignedSubsampler.java"
"src/joshua/e2e/scripts/joshua/Subsampler.java":

move ./src/joshua/e2e/scripts/joshua/AlignedSubsampler.java
./src/joshua/e2e/scripts/joshua/Subsampler.java
Shall I record this change? (1/11)  [ynWvplxdaqjk], or ? for help:
msg7916 (view) Author: kowey Date: 2009-06-18.09:15:17
On Wed, Jun 17, 2009 at 21:59:51 -0000, Nathaniel Filardo wrote:
> $ darcs record ./src/joshua/e2e/scripts/joshua/AlignedSubsampler.java
> ./src/joshua/e2e/scripts/joshua/Subsampler.java
> Recording changes in "src/joshua/e2e/scripts/joshua/AlignedSubsampler.java"
> "src/joshua/e2e/scripts/joshua/Subsampler.java":
> 
> move ./src/joshua/e2e/scripts/joshua/AlignedSubsampler.java
> ./src/joshua/e2e/scripts/joshua/Subsampler.java
> Shall I record this change? (1/11)  [ynWvplxdaqjk], or ? for help:

What happens if you just specify one (or the other) filename?
msg7920 (view) Author: nwf Date: 2009-06-19.14:51:50
Specifying either file behaves exactly as specifying both -- that is, the new
file with the old name is ignored.
msg8070 (view) Author: kowey Date: 2009-08-10.15:45:31
Hi Nathaniel,

Could you boil this down into a minimal test case for our test suite?  It could
go in the bugs/ directory.

Thanks!
History
Date User Action Args
2009-06-17 21:59:51nwfcreate
2009-06-18 09:15:19koweysetstatus: unread -> unknown
nosy: kowey, simon, thorkilnaur, dmitry.kurochkin, nwf
messages: + msg7916
2009-06-19 14:51:52nwfsetstatus: unknown -> unread
nosy: kowey, simon, thorkilnaur, dmitry.kurochkin, nwf
messages: + msg7920
2009-08-10 15:45:34koweysetstatus: unread -> needs-reproduction
nosy: kowey, simon, thorkilnaur, dmitry.kurochkin, nwf
messages: + msg8070
assignedto: nwf
2009-08-25 17:45:42adminsetnosy: + darcs-devel, - simon
2009-08-27 14:21:50adminsetnosy: kowey, darcs-devel, thorkilnaur, dmitry.kurochkin, nwf
2010-03-23 17:47:03koweysetassignedto: nwf -> kowey
2017-07-30 23:43:35ghsetstatus: needs-reproduction -> given-up