##// END OF EJS Templates
mergestate: make some callers not pass pointless node argument...
Martin von Zweigbergk -
r46062:0ce6af73 default
parent child Browse files
Show More
@@ -269,7 +269,7 b' def stripcmd(ui, repo, *revs, **opts):'
269 repo.dirstate.write(repo.currenttransaction())
269 repo.dirstate.write(repo.currenttransaction())
270
270
271 # clear resolve state
271 # clear resolve state
272 mergestatemod.mergestate.clean(repo, repo[b'.'].node())
272 mergestatemod.mergestate.clean(repo)
273
273
274 update = False
274 update = False
275
275
@@ -2516,7 +2516,7 b' class localrepository(object):'
2516 ui.status(
2516 ui.status(
2517 _(b'working directory now based on revision %d\n') % parents
2517 _(b'working directory now based on revision %d\n') % parents
2518 )
2518 )
2519 mergestatemod.mergestate.clean(self, self[b'.'].node())
2519 mergestatemod.mergestate.clean(self)
2520
2520
2521 # TODO: if we know which new heads may result from this rollback, pass
2521 # TODO: if we know which new heads may result from this rollback, pass
2522 # them to destroy(), which will prevent the branchhead cache from being
2522 # them to destroy(), which will prevent the branchhead cache from being
General Comments 0
You need to be logged in to leave comments. Login now