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.
#!/bin/sh
hg init repo
cd repo
touch foo
hg ci -Am 'add foo'
hg up -C null
# this should be stored as a delta against rev 0
echo foo bar baz > foo
hg ci -Am 'add foo again'
hg debugindex .hg/store/data/foo.i