Show More
@@ -1461,8 +1461,7 b' class workingctx(committablectx):' | |||||
1461 |
|
1461 | |||
1462 | def undelete(self, list): |
|
1462 | def undelete(self, list): | |
1463 | pctxs = self.parents() |
|
1463 | pctxs = self.parents() | |
1464 |
w |
|
1464 | with self._repo.wlock(): | |
1465 | try: |
|
|||
1466 | for f in list: |
|
1465 | for f in list: | |
1467 | if self._repo.dirstate[f] != 'r': |
|
1466 | if self._repo.dirstate[f] != 'r': | |
1468 | self._repo.ui.warn(_("%s not removed!\n") % f) |
|
1467 | self._repo.ui.warn(_("%s not removed!\n") % f) | |
@@ -1471,8 +1470,6 b' class workingctx(committablectx):' | |||||
1471 | t = fctx.data() |
|
1470 | t = fctx.data() | |
1472 | self._repo.wwrite(f, t, fctx.flags()) |
|
1471 | self._repo.wwrite(f, t, fctx.flags()) | |
1473 | self._repo.dirstate.normal(f) |
|
1472 | self._repo.dirstate.normal(f) | |
1474 | finally: |
|
|||
1475 | wlock.release() |
|
|||
1476 |
|
1473 | |||
1477 | def copy(self, source, dest): |
|
1474 | def copy(self, source, dest): | |
1478 | try: |
|
1475 | try: |
General Comments 0
You need to be logged in to leave comments.
Login now