Mercurial > evolve
comparison tests/test-evolve-continue.t @ 3636:92a2d3217de9
evolve: show a message when evolution leads to no changes to commit
In case of orphan resolution, evolution may result in no changes to commit. This
patch adds a use message in such cases. This is same as the rebase behavior.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Wed, 28 Mar 2018 14:11:13 +0530 |
| parents | edabac9e9dc5 |
| children | f6979d64b9fb |
comparison
equal
deleted
inserted
replaced
| 3635:debd2f974be5 | 3636:92a2d3217de9 |
|---|---|
| 126 $ hg resolve -m | 126 $ hg resolve -m |
| 127 (no more unresolved files) | 127 (no more unresolved files) |
| 128 continue: hg evolve --continue | 128 continue: hg evolve --continue |
| 129 $ hg diff | 129 $ hg diff |
| 130 | 130 |
| 131 XXX: maybe we should add a message here about evolve resulting in no commit | |
| 132 $ hg evolve --continue | 131 $ hg evolve --continue |
| 133 evolving 7:ad0a59d83efe "added e" | 132 evolving 7:ad0a59d83efe "added e" |
| 133 evolution of 7:ad0a59d83efe created no changes to commit | |
| 134 | 134 |
| 135 $ hg glog | 135 $ hg glog |
| 136 @ 8:00a5c774cc37 added d | 136 @ 8:00a5c774cc37 added d |
| 137 | () draft | 137 | () draft |
| 138 o 5:cb6a2ab625bb added c | 138 o 5:cb6a2ab625bb added c |