Mercurial > evolve
comparison tests/test-stabilize-conflict.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 |
|---|---|
| 168 $ hg resolve --all -m | 168 $ hg resolve --all -m |
| 169 (no more unresolved files) | 169 (no more unresolved files) |
| 170 continue: hg evolve --continue | 170 continue: hg evolve --continue |
| 171 $ hg evolve --continue | 171 $ hg evolve --continue |
| 172 evolving 4:71c18f70c34f "babar count up to fifteen" | 172 evolving 4:71c18f70c34f "babar count up to fifteen" |
| 173 working directory is now at 1836b91c6c1d | |
| 173 $ hg resolve -l | 174 $ hg resolve -l |
| 174 $ hg log -G | 175 $ hg log -G |
| 175 @ changeset: 6:1836b91c6c1d | 176 @ changeset: 6:1836b91c6c1d |
| 176 | tag: tip | 177 | tag: tip |
| 177 | user: test | 178 | user: test |