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