# HG changeset patch # User Pierre-Yves David # Date 2015-05-18 20:38:24 # Node ID 0d0ed375fbdf5f97e1e9618eba73fcf5a9422a1a # Parent ee665d3bf6dd057d6d1fb6be684b2be5e7becd4c recover: catch any exception, not just Exception We want recover to be rock solid. diff --git a/mercurial/transaction.py b/mercurial/transaction.py --- a/mercurial/transaction.py +++ b/mercurial/transaction.py @@ -496,7 +496,7 @@ class transaction(object): _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