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
# No local source
hg clone a b
echo $?
# No remote source
hg clone http://127.0.0.1:3121/a b
echo $?
rm -rf b # work around bug with http clone
# Inaccessible source
mkdir a
chmod 000 a
hg clone a b
echo $?
# Inaccessible destination
mkdir b
cd b
hg init
hg clone . ../a
echo $?
cd ..
chmod 700 a
rm -r a b
# Source of wrong type
if "$TESTDIR/hghave" -q fifo; then
mkfifo a
hg clone a b
echo $?
rm a
else
echo "abort: repository a not found!"
echo 255
fi
# Default destination, same directory
mkdir q
cd q
hg init
cd ..
hg clone q
true