Show More
@@ -2054,10 +2054,10 b' class metadataonlyctx(committablectx):' | |||||
2054 | # sanity check to ensure that the reused manifest parents are |
|
2054 | # sanity check to ensure that the reused manifest parents are | |
2055 | # manifests of our commit parents |
|
2055 | # manifests of our commit parents | |
2056 | mp1, mp2 = self.manifestctx().parents |
|
2056 | mp1, mp2 = self.manifestctx().parents | |
2057 |
if p1 != nullid and p1. |
|
2057 | if p1 != nullid and p1.manifestnode() != mp1: | |
2058 | raise RuntimeError('can\'t reuse the manifest: ' |
|
2058 | raise RuntimeError('can\'t reuse the manifest: ' | |
2059 | 'its p1 doesn\'t match the new ctx p1') |
|
2059 | 'its p1 doesn\'t match the new ctx p1') | |
2060 |
if p2 != nullid and p2. |
|
2060 | if p2 != nullid and p2.manifestnode() != mp2: | |
2061 | raise RuntimeError('can\'t reuse the manifest: ' |
|
2061 | raise RuntimeError('can\'t reuse the manifest: ' | |
2062 | 'its p2 doesn\'t match the new ctx p2') |
|
2062 | 'its p2 doesn\'t match the new ctx p2') | |
2063 |
|
2063 |
General Comments 0
You need to be logged in to leave comments.
Login now