Mercurial > hg-stable
changeset 39172:485a3349d5ee
rebase: do not pass in user option to rollback in-memory merge conflict
Nothing passed before e9e742bd0501.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Fri, 17 Aug 2018 10:21:25 +0900 |
| parents | e338a921a0cd |
| children | b892df0766e1 |
| files | hgext/rebase.py tests/test-rebase-inmemory.t |
| diffstat | 2 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/rebase.py Fri Aug 17 10:19:17 2018 +0900 +++ b/hgext/rebase.py Fri Aug 17 10:21:25 2018 +0900 @@ -864,7 +864,7 @@ 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)
--- a/tests/test-rebase-inmemory.t Fri Aug 17 10:19:17 2018 +0900 +++ b/tests/test-rebase-inmemory.t Fri Aug 17 10:21:25 2018 +0900 @@ -361,8 +361,14 @@ 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|