Revert changeset c67920d78248.
It breaks 'hg merge && hg up -c REV' when files exist only in one of the
manifests, making hg throw a traceback like:
#!/bin/sh
hg init
echo a > a
hg ci -d '0 0' -Ama
hg an a
echo "[ui]" >> $HGRCPATH
echo "strict=True" >> $HGRCPATH
hg an a
hg annotate a
echo % should succeed - up is an alias, not an abbreviation
hg up