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 da/foo

     2

adding foo

     3

% manifest

     4

200 Script output follows

     5

     6

     7

drwxr-xr-x da

     8

-rw-r--r-- 4 foo

     9

    10

    11

200 Script output follows

    12

    13

    14

-rw-r--r-- 4 foo

    15

    16