equal
deleted
inserted
replaced
2046 |
2046 |
2047 oldphase = repo[top].phase() |
2047 oldphase = repo[top].phase() |
2048 |
2048 |
2049 # assumes strip can roll itself back if interrupted |
2049 # assumes strip can roll itself back if interrupted |
2050 repo.setparents(*cparents) |
2050 repo.setparents(*cparents) |
|
2051 repo.dirstate.write(repo.currenttransaction()) |
2051 self.applied.pop() |
2052 self.applied.pop() |
2052 self.applieddirty = True |
2053 self.applieddirty = True |
2053 strip(self.ui, repo, [top], update=False, backup=False) |
2054 strip(self.ui, repo, [top], update=False, backup=False) |
2054 |
2055 |
2055 try: |
2056 try: |