D6956: unfinishedstate: suggested `hg update .` (including `.`) to complete update
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Fri Oct 4 10:32:09 EDT 2019
Closed by commit rHG8c4f32b907e6: unfinishedstate: suggested `hg update .` (including `.`) to complete update (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs Review".
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6956?vs=16788&id=16793
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6956/new/
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