# HG changeset patch # User Pierre-Yves David # Date 1431981504 18000 # Node ID 0d0ed375fbdf5f97e1e9618eba73fcf5a9422a1a # Parent ee665d3bf6dd057d6d1fb6be684b2be5e7becd4c recover: catch any exception, not just Exception We want recover to be rock solid. diff -r ee665d3bf6dd -r 0d0ed375fbdf mercurial/transaction.py --- a/mercurial/transaction.py Mon May 18 15:33:21 2015 -0500 +++ b/mercurial/transaction.py Mon May 18 15:38:24 2015 -0500 @@ -496,7 +496,7 @@ _playback(self.journal, self.report, self.opener, self._vfsmap, self.entries, self._backupentries, False) self.report(_("rollback completed\n")) - except Exception: + except BaseException: self.report(_("rollback failed - please run hg recover\n")) finally: self.journal = None