Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: correct misleading message in --confirm option
authorSushil khanchi <sushilkhanchi97@gmail.com>
Thu, 12 Jul 2018 22:35:54 +0530
changeset 38675 35b3f686157a
parent 38674 a50482254b0a
child 38676 3b072388ca78
rebase: correct misleading message in --confirm option Differential Revision: https://phab.mercurial-scm.org/D3939
hgext/rebase.py file | annotate | diff | comparison | revisions
tests/test-rebase-inmemory.t file | annotate | diff | comparison | revisions 
--- 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
Mercurial