diff --git a/mercurial/context.py b/mercurial/context.py --- a/mercurial/context.py +++ b/mercurial/context.py @@ -2054,10 +2054,10 @@ class metadataonlyctx(committablectx): # sanity check to ensure that the reused manifest parents are # manifests of our commit parents mp1, mp2 = self.manifestctx().parents - if p1 != nullid and p1.manifestctx().node() != mp1: + if p1 != nullid and p1.changeset()[0] != mp1: raise RuntimeError('can\'t reuse the manifest: ' 'its p1 doesn\'t match the new ctx p1') - if p2 != nullid and p2.manifestctx().node() != mp2: + if p2 != nullid and p2.changeset()[0] != mp2: raise RuntimeError('can\'t reuse the manifest: ' 'its p2 doesn\'t match the new ctx p2')