D6956: unfinishedstate: suggested `hg update .` (including `.`) to complete update
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Thu Oct 3 20:18:57 UTC 2019
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
`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.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D6956
AFFECTED FILES
mercurial/state.py
tests/test-merge1.t
CHANGE DETAILS
diff --git a/tests/test-merge1.t b/tests/test-merge1.t
--- a/tests/test-merge1.t
+++ b/tests/test-merge1.t
@@ -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
diff --git a/mercurial/state.py b/mercurial/state.py
--- a/mercurial/state.py
+++ b/mercurial/state.py
@@ -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,
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list