# HG changeset patch # User Yuya Nishihara # Date 2018-08-15 01:57:47 # Node ID 18cbe2d872d3184c4504094a6fd070ca96f48181 # Parent e9e742bd0501c02d9a59a7829068117bee8c4674 rebase: turn off inmemory flag on --stop Guessing from the inline comment, "in-memory rebase is not compatible with resuming rebases", in-memory rebasing should be disabled. diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -818,7 +818,7 @@ def rebase(ui, repo, **opts): if dryrun and confirm: raise error.Abort(_('cannot specify both --confirm and --dry-run')) - if action in {'abort', 'continue'} or repo.currenttransaction() is not None: + if action 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.)