Mercurial > hg

changeset 43045:8c4f32b907e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
unfinishedstate: suggested `hg update .` (including `.`) to complete update `hg update` can update to a different and undesired commit. For users who have commands.update.requiredest=yes, it's even an error to run just `hg update. Differential Revision: https://phab.mercurial-scm.org/D6956
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 03 Oct 2019 13:18:15 -0700
parents f9d35f01b8b3
children e360acfaf210
files mercurial/state.py tests/test-merge1.t
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/state.py	Mon Sep 30 17:26:41 2019 -0700
+++ b/mercurial/state.py	Thu Oct 03 13:18:15 2019 -0700
@@ -201,7 +201,7 @@
     'update', fname='updatestate', clearable=True,
     cmdmsg=_('last update was interrupted'),
     cmdhint=_("use 'hg update' to get a consistent checkout"),
-    statushint=_("To continue:    hg update")
+    statushint=_("To continue:    hg update .")
 )
 addunfinished(
     'bisect', fname='bisect.state', allowcommit=True, reportonly=True,
--- a/tests/test-merge1.t	Mon Sep 30 17:26:41 2019 -0700
+++ b/tests/test-merge1.t	Thu Oct 03 13:18:15 2019 -0700
@@ -49,7 +49,7 @@
   ? b/nonempty
   # The repository is in an unfinished *update* state.
   
-  # To continue:    hg update
+  # To continue:    hg update .
   
 
   $ rm b/nonempty