Mercurial > evolve
comparison CHANGELOG @ 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 | b91db6989231 |
| children | 231f593ccd5f |
comparison
equal
deleted
inserted
replaced
| 3838:2808c899bc10 | 3839:ac0717f23921 |
|---|---|
| 5 ------------------- | 5 ------------------- |
| 6 | 6 |
| 7 * evolve: handle branch changes when solving content divergence, | 7 * evolve: handle branch changes when solving content divergence, |
| 8 * evolve: add a help section dedicated to interrupted evolve, | 8 * evolve: add a help section dedicated to interrupted evolve, |
| 9 * evolve: merge commit messages when resolving content divergence (issue5877) | 9 * evolve: merge commit messages when resolving content divergence (issue5877) |
| 10 * evolve: show unfinished state information in `hg status -v` (issue5886) | |
| 10 | 11 |
| 11 8.0.1 -- 2018-06-11 | 12 8.0.1 -- 2018-06-11 |
| 12 ------------------- | 13 ------------------- |
| 13 | 14 |
| 14 * compatibility with mercurial 4.6.1 | 15 * compatibility with mercurial 4.6.1 |