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: call _dorebase() properly
authorGregory Szorc <gregory.szorc@gmail.com>
Thu, 16 Aug 2018 18:53:51 +0000
changeset 39133 06baaf43c959
parent 39132 873f3a56993f
child 39134 e338a921a0cd
rebase: call _dorebase() properly This fixes a regression from e9e742bd0501 where we failed to pass all necessary arguments to _dorebase(). Differential Revision: https://phab.mercurial-scm.org/D4302
hgext/rebase.py file | annotate | diff | comparison | revisions 
--- a/hgext/rebase.py	Thu Aug 16 16:59:40 2018 +0300
+++ b/hgext/rebase.py	Thu Aug 16 18:53:51 2018 +0000
@@ -864,7 +864,7 @@
         except error.InMemoryMergeConflictsError:
             ui.warn(_('hit merge conflicts; re-running rebase without in-memory'
                       ' merge\n'))
-            _dorebase(ui, repo, action='abort')
+            _dorebase(ui, repo, 'abort', opts)
             return _dorebase(ui, repo, action, opts, inmemory=False)
     else:
         return _dorebase(ui, repo, action, opts)
Mercurial