Mercurial > evolve
comparison tests/test-stabilize-result.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 | 71fbb679e311 |
| children | f6979d64b9fb |
comparison
equal
deleted
inserted
replaced
| 3635:debd2f974be5 | 3636:92a2d3217de9 |
|---|---|
| 38 move:[2] changea | 38 move:[2] changea |
| 39 atop:[3] changea | 39 atop:[3] changea |
| 40 perform evolve? [Ny] y | 40 perform evolve? [Ny] y |
| 41 hg rebase -r cce2c55b8965 -d fb9d051ec0a4 | 41 hg rebase -r cce2c55b8965 -d fb9d051ec0a4 |
| 42 resolving manifests | 42 resolving manifests |
| 43 evolution of 2:cce2c55b8965 created no changes to commit | |
| 44 | |
| 43 $ glog --hidden | 45 $ glog --hidden |
| 44 @ 3:fb9d051ec0a4@default(draft) bk:[changea] changea | 46 @ 3:fb9d051ec0a4@default(draft) bk:[changea] changea |
| 45 | | 47 | |
| 46 | x 2:cce2c55b8965@default(draft) bk:[] changea | 48 | x 2:cce2c55b8965@default(draft) bk:[] changea |
| 47 | | | 49 | | |