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:

0
0
adding changesets
killed!
transaction abort!
rollback completed
00changelog.i
data
journal.dirstate