equal
deleted
inserted
replaced
2998 parents = originalctx.parents() |
2998 parents = originalctx.parents() |
2999 else: |
2999 else: |
3000 parents = [repo[p] for p in parents if p is not None] |
3000 parents = [repo[p] for p in parents if p is not None] |
3001 parents = parents[:] |
3001 parents = parents[:] |
3002 while len(parents) < 2: |
3002 while len(parents) < 2: |
3003 parents.append(repo[nullid]) |
3003 parents.append(repo[nullrev]) |
3004 p1, p2 = self._parents = parents |
3004 p1, p2 = self._parents = parents |
3005 |
3005 |
3006 # sanity check to ensure that the reused manifest parents are |
3006 # sanity check to ensure that the reused manifest parents are |
3007 # manifests of our commit parents |
3007 # manifests of our commit parents |
3008 mp1, mp2 = self.manifestctx().parents |
3008 mp1, mp2 = self.manifestctx().parents |