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:
adding a
adding b
adding t.h
adding t/x
a
NONEXISTENT: No such file or directory
a
b
t.h
t/x
a: No such file or directory
NONEXISTENT: No such file or directory
b
t.h
t/x
a
NONEXISTENT: No such file in rev ce18e5bc5cd3
a
t/x
b
t.h
% -I/-X with relative path should work
b
t.h
t/x
t/x
t/x