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
echo "[extensions]" >> $HGRCPATH
echo "convert=" >> $HGRCPATH
hg help convert
hg init a
cd a
echo a > a
hg ci -d'0 0' -Ama
hg cp a b
hg ci -d'1 0' -mb
hg rm a
hg ci -d'2 0' -mc
hg mv b a
hg ci -d'3 0' -md
echo a >> a
hg ci -d'4 0' -me
cd ..
hg convert a 2>&1 | grep -v 'subversion python bindings could not be loaded'
hg --cwd a-hg pull ../a
touch bogusfile
echo % should fail
hg convert a bogusfile
mkdir bogusdir
chmod 000 bogusdir
echo % should fail
hg convert a bogusdir
echo % should succeed
chmod 700 bogusdir
hg convert a bogusdir