Skip to content
Snippets Groups Projects
Commit 35b3f686 authored by Sushil Khanchi's avatar Sushil Khanchi :koala:
Browse files

rebase: correct misleading message in --confirm option

Differential Revision: https://phab.mercurial-scm.org/D3939
parent a5048225
No related branches found
No related tags found
No related merge requests found
......@@ -854,7 +854,7 @@
rbsrt = rebaseruntime(repo, ui, inmemory=True, opts=opts)
confirm = opts.get('confirm')
if confirm:
ui.status(_('starting rebase...\n'))
ui.status(_('starting in-memory rebase\n'))
else:
ui.status(_('starting dry-run rebase; repository will not be '
'changed\n'))
......
......@@ -369,7 +369,7 @@
$ hg rebase -s 2 -d . --keep --config ui.interactive=True --confirm << EOF
> n
> EOF
starting rebase...
starting in-memory rebase
rebasing 2:177f92b77385 "c"
rebasing 3:055a42cdd887 "d"
rebasing 4:e860deea161a "e"
......@@ -400,7 +400,7 @@
$ hg rebase -s 2 -d . --keep --config ui.interactive=True --confirm << EOF
> y
> EOF
starting rebase...
starting in-memory rebase
rebasing 2:177f92b77385 "c"
rebasing 3:055a42cdd887 "d"
rebasing 4:e860deea161a "e"
......@@ -475,7 +475,7 @@
$ hg rebase -s 4 -d . --keep --config ui.interactive=True --confirm << EOF
> n
> EOF
starting rebase...
starting in-memory rebase
rebasing 4:e860deea161a "e"
merging e
hit a merge conflict
......@@ -516,7 +516,7 @@
$ hg rebase -s 4 -d . --keep --config ui.interactive=True --confirm << EOF
> y
> EOF
starting rebase...
starting in-memory rebase
rebasing 4:e860deea161a "e"
merging e
hit a merge conflict
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment