Show More
@@ -850,7 +850,7 b' class localrepository(object):' | |||||
850 | return self[changeid] |
|
850 | return self[changeid] | |
851 |
|
851 | |||
852 | def setparents(self, p1, p2=nullid): |
|
852 | def setparents(self, p1, p2=nullid): | |
853 |
self.dirstate. |
|
853 | with self.dirstate.parentchange(): | |
854 | copies = self.dirstate.setparents(p1, p2) |
|
854 | copies = self.dirstate.setparents(p1, p2) | |
855 | pctx = self[p1] |
|
855 | pctx = self[p1] | |
856 | if copies: |
|
856 | if copies: | |
@@ -864,7 +864,6 b' class localrepository(object):' | |||||
864 | for f, s in sorted(self.dirstate.copies().items()): |
|
864 | for f, s in sorted(self.dirstate.copies().items()): | |
865 | if f not in pctx and s not in pctx: |
|
865 | if f not in pctx and s not in pctx: | |
866 | self.dirstate.copy(None, f) |
|
866 | self.dirstate.copy(None, f) | |
867 | self.dirstate.endparentchange() |
|
|||
868 |
|
867 | |||
869 | def filectx(self, path, changeid=None, fileid=None): |
|
868 | def filectx(self, path, changeid=None, fileid=None): | |
870 | """changeid can be a changeset revision, node, or tag. |
|
869 | """changeid can be a changeset revision, node, or tag. |
General Comments 0
You need to be logged in to leave comments.
Login now