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

#!/usr/bin/env python

     2

#

     3

     4

import doctest

     5

     6

import mercurial.changelog

     7

# test doctest from changelog

     8

     9

doctest.testmod(mercurial.changelog)

    10