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
# http://www.selenic.com/mercurial/bts/issue322
echo % file replaced with directory
hg init a
cd a
echo a > a
hg commit -Ama
rm a
mkdir a
echo a > a/a
echo % should fail - would corrupt dirstate
hg add a/a
cd ..
echo % directory replaced with file
hg init c
cd c
mkdir a
echo a > a/a
hg commit -Ama
rm -r a
echo a > a
echo % should fail - would corrupt dirstate
hg add a
cd ..
echo % directory replaced with file
hg init d
cd d
mkdir b
mkdir b/c
echo a > b/c/d
hg commit -Ama
rm -r b
echo a > b
echo % should fail - would corrupt dirstate
hg add b
exit 0