Mercurial > hg
comparison hgext/rebase.py @ 39101: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 | ffb34ee6de9e |
comparison
equal
deleted
inserted
replaced
39100:e9e742bd0501 | 39101:18cbe2d872d3 |
---|---|
816 if confirm and action: | 816 if confirm and action: |
817 raise error.Abort(_('cannot specify both --confirm and --%s') % action) | 817 raise error.Abort(_('cannot specify both --confirm and --%s') % action) |
818 if dryrun and confirm: | 818 if dryrun and confirm: |
819 raise error.Abort(_('cannot specify both --confirm and --dry-run')) | 819 raise error.Abort(_('cannot specify both --confirm and --dry-run')) |
820 | 820 |
821 if action in {'abort', 'continue'} or repo.currenttransaction() is not None: | 821 if action or repo.currenttransaction() is not None: |
822 # in-memory rebase is not compatible with resuming rebases. | 822 # in-memory rebase is not compatible with resuming rebases. |
823 # (Or if it is run within a transaction, since the restart logic can | 823 # (Or if it is run within a transaction, since the restart logic can |
824 # fail the entire transaction.) | 824 # fail the entire transaction.) |
825 inmemory = False | 825 inmemory = False |
826 | 826 |