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.

See patch1600 for the failing test script.

This bug is not about merge at all and is independent of the patch
format. The same buggy state can be reached by merely adding a file,
then removing it and creating a directory with the same name, both with
darcs-1 and darcs-2 format:

ben@yuiitsu[1]:/tmp/pending>darcs init
ben@yuiitsu[1]:/tmp/pending>touch f
ben@yuiitsu[1]:/tmp/pending>darcs add f
Adding 'f'
ben@yuiitsu[1]:/tmp/pending>rm f
ben@yuiitsu[1]:/tmp/pending>mkdir f
ben@yuiitsu[1]:/tmp/pending>darcs whatsnew -l
a ./f/
ben@yuiitsu[1]:/tmp/pending>cat _darcs/patches/pending
addfile ./f

This is inconsistent: the pending patch contradicts what is in the
working tree. If we record that state we get the bogus patch with both
changes:

ben@yuiitsu[1]:/tmp/pending>darcs record -lam bogus
Do you want to add a long comment? [yn]n
Finished recording patch 'bogus'
ben@yuiitsu[1]:/tmp/pending>darcs log -v
patch 9a476d6d4dda009b1bad9edd645df5b2a5dcccf4
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed Jun 13 11:37:10 CEST 2018
  * bogus
    addfile ./f
    adddir ./f

Will send an update to the test script.

I found the what causes this, but the fix (attached) reveals another
problem.

patch 7f3ab0fff5332c65713911c03dd64155df04c46f
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed Jun 13 19:50:34 CEST 2018
  * resolve issue2548: inconsistent pending
  
  In Darcs.Repository.Diff.treeDiff we did not correctly handle the case
where
  a file is changed to a subTree: we only emptied the file but failed to add
  an rmfile patch before adding the dir.
  
  With a pending "addfile ./f" and a working tree where f has been
changed to
  a directory, we now get only the "adddir ./f" when recording with -l.
  
  However, this leaves us with a new pending "rmdir ./f; addfile ./f". This
  pending change can be reverted but does not show up with whatsnew -l and
  cannot be recorded with record -l.

Attachments

• resolve-issue2548_-inconsistent-pending.dpatch

patch 940da5fdbc54e64875e3ef9a962e582cef9b0423
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed Jun 13 19:50:34 CEST 2018
  * resolve issue2548: inconsistent pending

The remaining problem mentioned in msg20154 has been fixed.