Mercurial > evolve
diff tests/test-evolve.t @ 5834:c2484b0217ee mercurial-4.6
test-compat: merge mercurial-4.7 into mercurial-4.6
# no-check-commit
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 11 Mar 2021 14:49:22 +0800 |
| parents | 0f32359bcf3e be8f7eb3f3a0 |
| children |
line wrap: on
line diff
--- a/tests/test-evolve.t Thu Mar 11 14:48:12 2021 +0800 +++ b/tests/test-evolve.t Thu Mar 11 14:49:22 2021 +0800 @@ -1234,18 +1234,18 @@ Shows "use 'hg evolve' to..." hints iff the evolve command is enabled $ hg --hidden up 14 + updating to a hidden changeset 484fb3cfa7f2 + (hidden revision '484fb3cfa7f2' was rewritten as: 98e171e2f272) 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 484fb3cfa7f2 - (hidden revision '484fb3cfa7f2' was rewritten as: 98e171e2f272) working directory parent is obsolete! (484fb3cfa7f2) $ cat >> $HGRCPATH <<EOF > [experimental] > evolutioncommands=evolve > EOF $ hg --hidden up 15 + updating to a hidden changeset daa1ff1c7fbd + (hidden revision 'daa1ff1c7fbd' was rewritten as: 0c049e4e5422) 1 files updated, 0 files merged, 1 files removed, 0 files unresolved - updated to hidden changeset daa1ff1c7fbd - (hidden revision 'daa1ff1c7fbd' was rewritten as: 0c049e4e5422) working directory parent is obsolete! (daa1ff1c7fbd) (use 'hg evolve' to update to its successor: 0c049e4e5422) @@ -1491,9 +1491,9 @@ @ 1:ab832e43dd5a added a $ hg up f7ad41964313 --hidden + updating to a hidden changeset f7ad41964313 + (hidden revision 'f7ad41964313' was rewritten as: ab832e43dd5a) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset f7ad41964313 - (hidden revision 'f7ad41964313' was rewritten as: ab832e43dd5a) working directory parent is obsolete! (f7ad41964313) (use 'hg evolve' to update to its successor: ab832e43dd5a)