Mercurial > hg
comparison tests/test-merge1.t @ 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 | 12243f15d53e |
| children | a736ab681b78 |
comparison
equal
deleted
inserted
replaced
| 43044:f9d35f01b8b3 | 43045:8c4f32b907e6 |
|---|---|
| 47 Detect interrupted update by hg status --verbose | 47 Detect interrupted update by hg status --verbose |
| 48 $ hg status -v | 48 $ hg status -v |
| 49 ? b/nonempty | 49 ? b/nonempty |
| 50 # The repository is in an unfinished *update* state. | 50 # The repository is in an unfinished *update* state. |
| 51 | 51 |
| 52 # To continue: hg update | 52 # To continue: hg update . |
| 53 | 53 |
| 54 | 54 |
| 55 $ rm b/nonempty | 55 $ rm b/nonempty |
| 56 | 56 |
| 57 $ hg up | 57 $ hg up |