Mercurial > hg
changeset 38675:35b3f686157a
rebase: correct misleading message in --confirm option
Differential Revision: https://phab.mercurial-scm.org/D3939
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Thu, 12 Jul 2018 22:35:54 +0530 |
| parents | a50482254b0a |
| children | 3b072388ca78 |
| files | hgext/rebase.py tests/test-rebase-inmemory.t |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/rebase.py Thu Jul 12 22:23:51 2018 +0530 +++ b/hgext/rebase.py Thu Jul 12 22:35:54 2018 +0530 @@ -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'))
--- a/tests/test-rebase-inmemory.t Thu Jul 12 22:23:51 2018 +0530 +++ b/tests/test-rebase-inmemory.t Thu Jul 12 22:35:54 2018 +0530 @@ -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