author | Pierre-Yves David <pierre-yves.david@fb.com> |
Mon, 18 May 2015 15:33:21 -0500 | |
changeset 25182 | ee665d3bf6dd |
parent 25181 | d26703eb3dc5 |
child 25183 | 0d0ed375fbdf |
--- a/mercurial/exchange.py Mon May 18 13:23:14 2015 -0500 +++ b/mercurial/exchange.py Mon May 18 15:33:21 2015 -0500 @@ -1315,7 +1315,7 @@ def recordout(output): r.newpart('output', data=output, mandatory=False) tr.close() - except Exception, exc: + except BaseException, exc: exc.duringunbundle2 = True if captureoutput and r is not None: parts = exc._bundle2salvagedoutput = r.salvageoutput()