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 % test --time
hg --time help -q help 2>&1 | grep Time > /dev/null || echo --time failed
echo % test --profile
if "$TESTDIR/hghave" -q hotshot; then
# hotshot might be missing for licensing issues
hg --profile help -q help 2>&1 | grep ncalls > /dev/null || echo --profile failed
fi
echo % test --lsprof
if "$TESTDIR/hghave" -q lsprof; then
hg --lsprof help -q help 2>&1 | grep CallCount > /dev/null || echo --lsprof failed
fi