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.
changeset: 0:9c2cf2b35aa7
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: add foo
changeset: 1:3756a9556b89
tag: tip
user: test
date: Mon Jan 12 13:46:41 1970 +0000
summary: change foo
2 revisions:
9c2cf2b35aa7
3756a9556b89