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:

#!/usr/bin/env python
#

import doctest

import mercurial.changelog
# test doctest from changelog

doctest.testmod(mercurial.changelog)