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

#!/bin/sh

     2

     3

hg init

     4

hg log

     5

hg grep wah

     6

hg manifest

     7

hg verify