Mercurial > evolve
diff tests/test-evolve.t @ 3794:b89108d3eca0
branching: merge with stable
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 05 Jun 2018 03:37:15 +0200 |
| parents | 1e103c7f7663 |
| children | ededd22e7c7b |
line wrap: on
line diff
--- a/tests/test-evolve.t Tue Jun 05 03:36:40 2018 +0200 +++ b/tests/test-evolve.t Tue Jun 05 03:37:15 2018 +0200 @@ -1254,18 +1254,18 @@ Shows "use 'hg evolve' to..." hints iff the evolve command is enabled $ hg --hidden up 14 - updating to a hidden changeset 484fb3cfa7f2 + 2 files updated, 0 files merged, 1 files removed, 0 files unresolved + updated to hidden changeset 484fb3cfa7f2 (hidden revision '484fb3cfa7f2' was rewritten as: 98e171e2f272) - 2 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory parent is obsolete! (484fb3cfa7f2) $ cat >> $HGRCPATH <<EOF > [experimental] > evolutioncommands=evolve > EOF $ hg --hidden up 15 - updating to a hidden changeset daa1ff1c7fbd + 1 files updated, 0 files merged, 1 files removed, 0 files unresolved + updated to hidden changeset daa1ff1c7fbd (hidden revision 'daa1ff1c7fbd' was rewritten as: 0c049e4e5422) - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory parent is obsolete! (daa1ff1c7fbd) (use 'hg evolve' to update to its successor: 0c049e4e5422)