Mercurial > hg-stable
changeset 39138:18cbe2d872d3
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.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Wed, 15 Aug 2018 10:57:47 +0900 |
| parents | e9e742bd0501 |
| children | 08b2ae9fc030 |
| files | hgext/rebase.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/rebase.py Wed Aug 15 10:47:07 2018 +0900 +++ b/hgext/rebase.py Wed Aug 15 10:57:47 2018 +0900 @@ -818,7 +818,7 @@ 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.)