Mercurial > evolve
comparison tests/test-stabilize-result.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 | d166b3dc5e8a |
comparison
equal
deleted
inserted
replaced
| 3493:4544067b831b | 3494:14cd04ff968e |
|---|---|
| 99 $ hg resolve -m a | 99 $ hg resolve -m a |
| 100 (no more unresolved files) | 100 (no more unresolved files) |
| 101 continue: hg evolve --continue | 101 continue: hg evolve --continue |
| 102 $ hg evolve --continue | 102 $ hg evolve --continue |
| 103 evolving 4:3655f0f50885 "newer a" | 103 evolving 4:3655f0f50885 "newer a" |
| 104 working directory is now at 1cf0aacfd363 | |
| 104 | 105 |
| 105 Stabilize latecomer with different parent | 106 Stabilize latecomer with different parent |
| 106 ========================================= | 107 ========================================= |
| 107 | 108 |
| 108 (the same-parent case is handled in test-evolve.t) | 109 (the same-parent case is handled in test-evolve.t) |