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

changeset:   0:9c2cf2b35aa7

     2

user:        test

     3

date:        Mon Jan 12 13:46:40 1970 +0000

     4

summary:     add foo

     5

     6

changeset:   1:3756a9556b89

     7

tag:         tip

     8

user:        test

     9

date:        Mon Jan 12 13:46:41 1970 +0000

    10

summary:     change foo

    11

    12

2 revisions:

    13

9c2cf2b35aa7

    14

3756a9556b89