Submitter | Yuya Nishihara |
---|---|
Date | Aug. 15, 2018, 2:06 a.m. |
Message ID | <b257de027bd2aa380dd3.1534298792@mimosa> |
Download | mbox | patch |
Permalink | /patch/33740/ |
State | Accepted |
Headers | show |
Comments
Patch
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.)