Fix file-changed-to-dir and dir-to-file commits (issue660). Allow adding to dirstate files that clash with previously existing but marked for removal. Protect from reintroducing clashes by revert. This change doesn't address related issues with update. Current workaround is to do "clean" update by manually removing conflicting files/dirs from working directory.

     1

adding foo

     2

0 files updated, 0 files merged, 1 files removed, 0 files unresolved

     3

adding foo

     4

   rev    offset  length   base linkrev nodeid       p1           p2

     5

     0         0       0      0       0 b80de5d13875 000000000000 000000000000

     6

     1         0      24      0       1 0376abec49b8 000000000000 000000000000