darcs

Issue 2548 inconsistent pending after merge (darcs-2 only)

Title inconsistent pending after merge (darcs-2 only)
Priority urgent Status unknown
Milestone Resolved in
Superseder Nosy List bf
Assigned To
Topics

Created on 2017-09-10.13:11:22 by bf, last changed 2017-09-10.13:17:27 by bf.

Messages
msg19657 (view) Author: bf Date: 2017-09-10.13:11:21
1. Summarise the issue (what were doing, what went wrong?)

repo1: create file f and record
repo2: create directory f and record
pull from repo1 into repo2
resolve the conflict by removing file f and renaming dir f.~0~ to f

Then

1) darcs whatsnew reports no changes
2) revert -a therefore does nothing
3) but we still have a silent 'addfile f' in pending,
   which can be seen when doing darcs record
4) when we record -l, we get asked about addfile f *and* adddir f (!)
5) this is actually recorded as a patch that contains both changes

This is pretty bad. I will send a patch with a test script separately.
msg19659 (view) Author: bf Date: 2017-09-10.13:17:26
See patch1600 for the failing test script.
History
Date User Action Args
2017-09-10 13:11:23bfcreate
2017-09-10 13:17:27bfsetmessages: + msg19659