Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
unfinishedstate: suggested `hg update .` (including `.`) to complete update
authorMartin von Zweigbergk <martinvonz@google.com>
Thu, 03 Oct 2019 13:18:15 -0700
changeset 43045 8c4f32b907e6
parent 43044 f9d35f01b8b3
child 43046 e360acfaf210
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
mercurial/state.py file | annotate | diff | comparison | revisions
tests/test-merge1.t file | annotate | diff | comparison | revisions 
--- 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
hg-stable