equal
deleted
inserted
replaced
2119 |
2119 |
2120 self.applied.append(statusentry(n, patchfn)) |
2120 self.applied.append(statusentry(n, patchfn)) |
2121 finally: |
2121 finally: |
2122 lockmod.release(tr, lock) |
2122 lockmod.release(tr, lock) |
2123 except: # re-raises |
2123 except: # re-raises |
2124 ctx = repo[cparents[0]] |
2124 with repo.dirstate.changing_parents(repo): |
2125 repo.dirstate.rebuild(ctx.node(), ctx.manifest()) |
2125 ctx = repo[cparents[0]] |
2126 repo.dirstate.write(repo.currenttransaction()) |
2126 repo.dirstate.rebuild(ctx.node(), ctx.manifest()) |
2127 self.savedirty() |
2127 self.savedirty() |
2128 self.ui.warn( |
2128 self.ui.warn( |
2129 _( |
2129 _( |
2130 b'qrefresh interrupted while patch was popped! ' |
2130 b'qrefresh interrupted while patch was popped! ' |
2131 b'(revert --all, qpush to recover)\n' |
2131 b'(revert --all, qpush to recover)\n' |