hgext/rebase.py
changeset 35701 c5d220a621e7
parent 35487 bf556bd2f589
child 35915 83b9f96ce20f
child 36980 a046d6890761
--- a/hgext/rebase.py	Wed Jan 17 17:59:12 2018 -0500
+++ b/hgext/rebase.py	Wed Dec 27 17:38:28 2017 -0600
@@ -771,8 +771,11 @@
 
     """
     inmemory = ui.configbool('rebase', 'experimental.inmemory')
-    if opts.get('continue') or opts.get('abort'):
+    if (opts.get('continue') or opts.get('abort') or
+        repo.currenttransaction() is not None):
         # in-memory rebase is not compatible with resuming rebases.
+        # (Or if it is run within a transaction, since the restart logic can
+        # fail the entire transaction.)
         inmemory = False
 
     if inmemory: