[PATCH 2 of 2] rebase: do not pass in user option to rollback in-memory merge conflict
Yuya Nishihara
yuya at tcha.org
Thu Aug 16 21:34:03 EDT 2018
# HG changeset patch
# User Yuya Nishihara <yuya at tcha.org>
# Date 1534468885 -32400
# Fri Aug 17 10:21:25 2018 +0900
# Node ID 485a3349d5eed5718cd93a5b3d598e11a5fa3673
# Parent e338a921a0cdc60717e5aebc7dc4bb9ba203478d
rebase: do not pass in user option to rollback in-memory merge conflict
Nothing passed before e9e742bd0501.
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -864,7 +864,7 @@ def rebase(ui, repo, **opts):
except error.InMemoryMergeConflictsError:
ui.warn(_('hit merge conflicts; re-running rebase without in-memory'
' merge\n'))
- _dorebase(ui, repo, 'abort', opts)
+ _dorebase(ui, repo, action='abort', opts={})
return _dorebase(ui, repo, action, opts, inmemory=False)
else:
return _dorebase(ui, repo, action, opts)
diff --git a/tests/test-rebase-inmemory.t b/tests/test-rebase-inmemory.t
--- a/tests/test-rebase-inmemory.t
+++ b/tests/test-rebase-inmemory.t
@@ -361,8 +361,14 @@ In-memory rebase that fails due to merge
transaction abort!
rollback completed
hit merge conflicts; re-running rebase without in-memory merge
- abort: abort and continue do not allow specifying revisions
- [255]
+ rebase aborted
+ rebasing 2:177f92b77385 "c"
+ rebasing 3:055a42cdd887 "d"
+ rebasing 4:e860deea161a "e"
+ merging e
+ warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
+ unresolved conflicts (see hg resolve, then hg rebase --continue)
+ [1]
==========================
Test for --confirm option|
More information about the Mercurial-devel
mailing list