D4302: rebase: call _dorebase() properly
indygreg (Gregory Szorc)
phabricator at mercurial-scm.org
Thu Aug 16 15:01:18 EDT 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG06baaf43c959: rebase: call _dorebase() properly (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D4302?vs=10395&id=10396
REVISION DETAIL
https://phab.mercurial-scm.org/D4302
AFFECTED FILES
hgext/rebase.py
CHANGE DETAILS
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -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)
To: indygreg, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list