Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: turn off inmemory flag on --stop
authorYuya Nishihara <yuya@tcha.org>
Wed, 15 Aug 2018 10:57:47 +0900
changeset 39101 18cbe2d872d3
parent 39100 e9e742bd0501
child 39102 08b2ae9fc030
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.
hgext/rebase.py file | annotate | diff | comparison | revisions 
--- 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.)
Mercurial