equal
deleted
inserted
replaced
255 returned by the call. |
255 returned by the call. |
256 |
256 |
257 See localrepo.setparents() |
257 See localrepo.setparents() |
258 """ |
258 """ |
259 if self._parentwriters == 0: |
259 if self._parentwriters == 0: |
260 raise ValueError("cannot set dirstate parent without " + |
260 raise ValueError("cannot set dirstate parent without " |
261 " calling dirstate.begingparentchange") |
261 "calling dirstate.beginparentchange") |
262 |
262 |
263 self._dirty = self._dirtypl = True |
263 self._dirty = self._dirtypl = True |
264 oldp2 = self._pl[1] |
264 oldp2 = self._pl[1] |
265 self._pl = p1, p2 |
265 self._pl = p1, p2 |
266 copies = {} |
266 copies = {} |