Mercurial > evolve
comparison tests/test-evolve-phase.t @ 3494:14cd04ff968e
evolve: show the updated working directory after `hg evolve --continue`
`hg evolve` shows a nice message about the new working directory when the evolve
ends but if the evolve is interrupted by conflicts and you continue the evolve
resolving the conflicts, that nice message is lost. Let's have that in case of
`--continue` too.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Mon, 29 Jan 2018 00:09:44 +0530 |
| parents | 05bd493d496d |
| children | d5adce52cef4 f6979d64b9fb |
comparison
equal
deleted
inserted
replaced
| 3493:4544067b831b | 3494:14cd04ff968e |
|---|---|
| 116 $ hg resolve -m | 116 $ hg resolve -m |
| 117 (no more unresolved files) | 117 (no more unresolved files) |
| 118 continue: hg evolve --continue | 118 continue: hg evolve --continue |
| 119 $ hg evolve -c | 119 $ hg evolve -c |
| 120 evolving 2:13833940840c "c" | 120 evolving 2:13833940840c "c" |
| 121 working directory is now at 3d2080c198e5 | |
| 121 | 122 |
| 122 $ hg glog | 123 $ hg glog |
| 123 @ 4 - 3d2080c198e5 c (secret) | 124 @ 4 - 3d2080c198e5 c (secret) |
| 124 | | 125 | |
| 125 o 3 - 87495ea7c9ec b (draft) | 126 o 3 - 87495ea7c9ec b (draft) |