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:

321
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
sub/b not present
sub not present