author | Augie Fackler <augie@google.com> |
Mon, 21 Nov 2016 21:06:34 -0500 | |
changeset 30492 | 77cd647b04ac |
parent 30491 | 13251523b20c |
child 30493 | 762c8a128357 |
--- a/mercurial/localrepo.py Mon Nov 21 21:06:22 2016 -0500 +++ b/mercurial/localrepo.py Mon Nov 21 21:06:34 2016 -0500 @@ -31,6 +31,7 @@ cmdutil, context, dirstate, + dirstateguard, encoding, error, exchange, @@ -1141,7 +1142,7 @@ wlock = self.wlock() lock = self.lock() if self.svfs.exists("undo"): - dsguard = cmdutil.dirstateguard(self, 'rollback') + dsguard = dirstateguard.dirstateguard(self, 'rollback') return self._rollback(dryrun, force, dsguard) else: