Mercurial > hg
comparison hgext/strip.py @ 26988:7e38d49bc713
strip: switch to mergestate.clean()
See the previous patches for why we're doing this.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Tue, 17 Nov 2015 17:02:35 -0800 |
parents | 4b0c3df5d635 |
children | 8279c5d116a0 |
comparison
equal
deleted
inserted
replaced
26987:416b2b7d3068 | 26988:7e38d49bc713 |
---|---|
206 | 206 |
207 repo.dirstate.rebuild(urev, uctx.manifest(), changedfiles) | 207 repo.dirstate.rebuild(urev, uctx.manifest(), changedfiles) |
208 repo.dirstate.write(repo.currenttransaction()) | 208 repo.dirstate.write(repo.currenttransaction()) |
209 | 209 |
210 # clear resolve state | 210 # clear resolve state |
211 ms = merge.mergestate(repo) | 211 merge.mergestate.clean(repo, repo['.'].node()) |
212 ms.reset(repo['.'].node()) | |
213 | 212 |
214 update = False | 213 update = False |
215 | 214 |
216 | 215 |
217 strip(ui, repo, revs, backup=backup, update=update, | 216 strip(ui, repo, revs, backup=backup, update=update, |