equal
deleted
inserted
replaced
56 if (util.safehasattr(repo, 'mq') and |
56 if (util.safehasattr(repo, 'mq') and |
57 p2 != nullid |
57 p2 != nullid |
58 and p2 in [x.node for x in repo.mq.applied]): |
58 and p2 in [x.node for x in repo.mq.applied]): |
59 urev = p2 |
59 urev = p2 |
60 hg.clean(repo, urev) |
60 hg.clean(repo, urev) |
61 repo.dirstate.write() |
61 repo.dirstate.write(repo.currenttransaction()) |
62 |
62 |
63 repair.strip(ui, repo, revs, backup) |
63 repair.strip(ui, repo, revs, backup) |
64 |
64 |
65 marks = repo._bookmarks |
65 marks = repo._bookmarks |
66 if bookmark: |
66 if bookmark: |
203 dirstate = repo.dirstate |
203 dirstate = repo.dirstate |
204 dirchanges = [f for f in dirstate if dirstate[f] != 'n'] |
204 dirchanges = [f for f in dirstate if dirstate[f] != 'n'] |
205 changedfiles.extend(dirchanges) |
205 changedfiles.extend(dirchanges) |
206 |
206 |
207 repo.dirstate.rebuild(urev, uctx.manifest(), changedfiles) |
207 repo.dirstate.rebuild(urev, uctx.manifest(), changedfiles) |
208 repo.dirstate.write() |
208 repo.dirstate.write(repo.currenttransaction()) |
209 |
209 |
210 # clear resolve state |
210 # clear resolve state |
211 ms = merge.mergestate(repo) |
211 ms = merge.mergestate(repo) |
212 ms.reset(repo['.'].node()) |
212 ms.reset(repo['.'].node()) |
213 |
213 |