# HG changeset patch # User Martin von Zweigbergk <martinvonz@google.com> # Date 1570133895 25200 # Thu Oct 03 13:18:15 2019 -0700 # Node ID 8c4f32b907e6bea3cf1ac9870eef90601d7c5294 # Parent f9d35f01b8b3da20e26d87c10921b79341b5738a 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 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, 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