From 65b96951f26415099b2e3702f0fc689a1557888a Mon Sep 17 00:00:00 2001
From: Phil Cohen <phillco@fb.com>
Date: Sun, 25 Feb 2018 22:54:23 -0800
Subject: [PATCH] rebase: fix IMM restarting on general exceptions

Summary: It didn't properly turn off IMM after D6817683, but ran the rebase with IMM again.

Reviewed By: singhsrb

Differential Revision: D7072951

fbshipit-source-id: 9f9386fbd5748ff002de2c60132d5d5708380714
---
 hgext/rebase.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hgext/rebase.py b/hgext/rebase.py
index a94f65e645..7f8e1cda69 100644
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -860,6 +860,7 @@ def rebase(ui, repo, **opts):
                          '(%s)\n' % e))
                 ui.log("rebase", "", rebase_imm_restart=True,
                     rebase_imm_exception=str(e))
+                rbsrt.inmemory = False
                 _origrebase(ui, repo, rbsrt, **{'abort': True})
                 return _origrebase(ui, repo, rbsrt, **opts)
             else: