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:

     1

checking changesets

     2

checking manifests

     3

crosschecking files in changesets and manifests

     4

checking files

     5

0 files, 0 changesets, 0 total revisions