Mercurial > evolve
diff tests/test-evolve-abort-contentdiv.t @ 3839:ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
`hg status -v` shows information about unfinished states or `hg status` shows it
when `commands.status.verbose=True` is set.
Before this patch, information about interrupted evolve does not show up because
evolve does not resgiters in cmdutil.STATES. This patch make sure we register
evolve related information there.
There has been an idea to unify cmdutil.unfinishedstates and cmdutil.STATES
which needs some work and the resulting state does looks a bit complicated. So
till the time we unify them, let's fix this bug by registering in
cmdutil.STATES.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Wed, 06 Jun 2018 04:29:05 +0530 |
parents | fb821ed44f86 |
children | 82b79a8dafd9 |
line wrap: on
line diff
--- a/tests/test-evolve-abort-contentdiv.t Tue Jun 12 13:58:14 2018 +0200 +++ b/tests/test-evolve-abort-contentdiv.t Wed Jun 06 04:29:05 2018 +0530 @@ -81,6 +81,22 @@ abort: fix conflicts and run 'hg evolve --continue' or use 'hg update -C .' to abort [255] + $ hg status -v + M d + # The repository is in an unfinished *evolve* state. + + # Unresolved merge conflicts: + # + # d + # + # To mark files as resolved: hg resolve --mark FILE + + # To continue: hg evolve --continue + # To abort: hg evolve --abort + # To stop: hg evolve --stop + # (also see `hg help evolve.interrupted`) + + $ hg evolve --abort evolve aborted working directory is now at 9c1631e352d9