equal
deleted
inserted
replaced
619 |
619 |
620 self.ui.warn(_("patch didn't work out, merging %s\n") % patch) |
620 self.ui.warn(_("patch didn't work out, merging %s\n") % patch) |
621 |
621 |
622 # apply failed, strip away that rev and merge. |
622 # apply failed, strip away that rev and merge. |
623 hg.clean(repo, head) |
623 hg.clean(repo, head) |
624 strip(self.ui, repo, [n], update=False, backup='strip') |
624 strip(self.ui, repo, [n], update=False, backup=False) |
625 |
625 |
626 ctx = repo[rev] |
626 ctx = repo[rev] |
627 ret = hg.merge(repo, rev) |
627 ret = hg.merge(repo, rev) |
628 if ret: |
628 if ret: |
629 raise util.Abort(_("update returned %d") % ret) |
629 raise util.Abort(_("update returned %d") % ret) |
1461 repo.dirstate.normal(f) |
1461 repo.dirstate.normal(f) |
1462 repo.setparents(qp, nullid) |
1462 repo.setparents(qp, nullid) |
1463 for patch in reversed(self.applied[start:end]): |
1463 for patch in reversed(self.applied[start:end]): |
1464 self.ui.status(_("popping %s\n") % patch.name) |
1464 self.ui.status(_("popping %s\n") % patch.name) |
1465 del self.applied[start:end] |
1465 del self.applied[start:end] |
1466 strip(self.ui, repo, [rev], update=False, backup='strip') |
1466 strip(self.ui, repo, [rev], update=False, backup=False) |
1467 for s, state in repo['.'].substate.items(): |
1467 for s, state in repo['.'].substate.items(): |
1468 repo['.'].sub(s).get(state) |
1468 repo['.'].sub(s).get(state) |
1469 if self.applied: |
1469 if self.applied: |
1470 self.ui.write(_("now at: %s\n") % self.applied[-1].name) |
1470 self.ui.write(_("now at: %s\n") % self.applied[-1].name) |
1471 else: |
1471 else: |
1651 |
1651 |
1652 # assumes strip can roll itself back if interrupted |
1652 # assumes strip can roll itself back if interrupted |
1653 repo.setparents(*cparents) |
1653 repo.setparents(*cparents) |
1654 self.applied.pop() |
1654 self.applied.pop() |
1655 self.applieddirty = True |
1655 self.applieddirty = True |
1656 strip(self.ui, repo, [top], update=False, backup='strip') |
1656 strip(self.ui, repo, [top], update=False, backup=False) |
1657 except: # re-raises |
1657 except: # re-raises |
1658 repo.dirstate.invalidate() |
1658 repo.dirstate.invalidate() |
1659 raise |
1659 raise |
1660 |
1660 |
1661 try: |
1661 try: |
1849 pp = repo.dirstate.parents() |
1849 pp = repo.dirstate.parents() |
1850 if rev in pp: |
1850 if rev in pp: |
1851 update = True |
1851 update = True |
1852 else: |
1852 else: |
1853 update = False |
1853 update = False |
1854 strip(self.ui, repo, [rev], update=update, backup='strip') |
1854 strip(self.ui, repo, [rev], update=update, backup=False) |
1855 if qpp: |
1855 if qpp: |
1856 self.ui.warn(_("saved queue repository parents: %s %s\n") % |
1856 self.ui.warn(_("saved queue repository parents: %s %s\n") % |
1857 (short(qpp[0]), short(qpp[1]))) |
1857 (short(qpp[0]), short(qpp[1]))) |
1858 if qupdate: |
1858 if qupdate: |
1859 self.ui.status(_("updating queue directory\n")) |
1859 self.ui.status(_("updating queue directory\n")) |