darcs

Issue 2242 rollback mv patches confuses darcs

Title rollback mv patches confuses darcs
Priority Status needs-reproduction
Milestone Resolved in
Superseder Nosy List kowey
Assigned To
Topics ThePendingPatch

Created on 2012-09-24.09:54:57 by kowey, last changed 2012-09-24.10:15:02 by owst.

Messages
msg16120 (view) Author: kowey Date: 2012-09-24.09:54:54
1. Summarise the issue (what were doing, what went wrong?)

Had a patch which among other things mv'ed a dir and changed its 
contents.  Rolled it back, got lots of R's and A's

2. What behaviour were you expecting instead?

A mv patch with some hunk changes

3. What darcs version are you using? (Try: darcs --exact-version)

2.9.4 (+ 2 patches)

Not a public repo, I'm afraid, but for my references, patch in question 
was "Prefer lemma to any of the lex-related features in morph 
realisation."
msg16121 (view) Author: owst Date: 2012-09-24.10:15:01
$ darcs init --repo R
$ cd R
$ mkdir A 
$ touch A/foo
$ darcs rec -alm 'Add A'
 
$ darcs mv A B
$ echo -e 'line1\nline2' > B/foo
$ darcs rec -alm 'Move A -> B and change foo'
 
$ # Rollback everything in the move/change patch 
$ echo ynya | darcs roll

Gives this (incorrect) darcs wh output.

move ./B ./A
hunk ./A/foo 1
-line1
-line2
rmfile ./A/foo
rmdir ./A

What are those rmfile/rmdir prims doing there? Running with -s gives:

% darcs wh -s
./B -> ./A
R ./A/foo
R ./A/

I'll send this as a failing test. Kowey - could you tweak the test to
make it generate some 'A' entries? I couldn't do it...
History
Date User Action Args
2012-09-24 09:54:57koweycreate
2012-09-24 10:15:02owstsetmessages: + msg16121