Show More
@@ -2337,11 +2337,11 b' class metadataonlyctx(committablectx):' | |||||
2337 | # manifests of our commit parents |
|
2337 | # manifests of our commit parents | |
2338 | mp1, mp2 = self.manifestctx().parents |
|
2338 | mp1, mp2 = self.manifestctx().parents | |
2339 | if p1 != nullid and p1.manifestnode() != mp1: |
|
2339 | if p1 != nullid and p1.manifestnode() != mp1: | |
2340 |
raise RuntimeError(' |
|
2340 | raise RuntimeError(r"can't reuse the manifest: its p1 " | |
2341 |
' |
|
2341 | r"doesn't match the new ctx p1") | |
2342 | if p2 != nullid and p2.manifestnode() != mp2: |
|
2342 | if p2 != nullid and p2.manifestnode() != mp2: | |
2343 |
raise RuntimeError(' |
|
2343 | raise RuntimeError(r"can't reuse the manifest: " | |
2344 |
' |
|
2344 | r"its p2 doesn't match the new ctx p2") | |
2345 |
|
2345 | |||
2346 | self._files = originalctx.files() |
|
2346 | self._files = originalctx.files() | |
2347 | self.substate = {} |
|
2347 | self.substate = {} |
General Comments 0
You need to be logged in to leave comments.
Login now