Fix 3-way-merge of original parent, workdir and new parent.
The dirstate has to match what is in the repository (what would be
checked out with 'hg update -C'), because the resulting file may be
identical to the new parent, or it may be completely different.
Previously the dirstate wasn't updated, so if you changed the file to
look like the original parent, it might be considered unmodified
relative to the new parent.
#!/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 -rf a b
# Source of wrong type
mkfifo a
hg clone a b
echo $?
rm a
# Default destination, same directory
mkdir q
cd q
hg init
cd ..
hg clone q
true