Mercurial > public > mercurial-scm > hg
comparison mercurial/state.py @ 43045:8c4f32b907e6
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 | 3c16b9c0b099 |
| children | 2372284d9457 |
comparison
equal
deleted
inserted
replaced
| 43044:f9d35f01b8b3 | 43045:8c4f32b907e6 |
|---|---|
| 199 | 199 |
| 200 addunfinished( | 200 addunfinished( |
| 201 'update', fname='updatestate', clearable=True, | 201 'update', fname='updatestate', clearable=True, |
| 202 cmdmsg=_('last update was interrupted'), | 202 cmdmsg=_('last update was interrupted'), |
| 203 cmdhint=_("use 'hg update' to get a consistent checkout"), | 203 cmdhint=_("use 'hg update' to get a consistent checkout"), |
| 204 statushint=_("To continue: hg update") | 204 statushint=_("To continue: hg update .") |
| 205 ) | 205 ) |
| 206 addunfinished( | 206 addunfinished( |
| 207 'bisect', fname='bisect.state', allowcommit=True, reportonly=True, | 207 'bisect', fname='bisect.state', allowcommit=True, reportonly=True, |
| 208 statushint=_('To mark the changeset good: hg bisect --good\n' | 208 statushint=_('To mark the changeset good: hg bisect --good\n' |
| 209 'To mark the changeset bad: hg bisect --bad\n' | 209 'To mark the changeset bad: hg bisect --bad\n' |