Mercurial > evolve
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 5833:be8f7eb3f3a0 | 5834:c2484b0217ee |
|---|---|
| 1232 [255] | 1232 [255] |
| 1233 | 1233 |
| 1234 Shows "use 'hg evolve' to..." hints iff the evolve command is enabled | 1234 Shows "use 'hg evolve' to..." hints iff the evolve command is enabled |
| 1235 | 1235 |
| 1236 $ hg --hidden up 14 | 1236 $ hg --hidden up 14 |
| 1237 updating to a hidden changeset 484fb3cfa7f2 | |
| 1238 (hidden revision '484fb3cfa7f2' was rewritten as: 98e171e2f272) | |
| 1237 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1239 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 1238 updated to hidden changeset 484fb3cfa7f2 | |
| 1239 (hidden revision '484fb3cfa7f2' was rewritten as: 98e171e2f272) | |
| 1240 working directory parent is obsolete! (484fb3cfa7f2) | 1240 working directory parent is obsolete! (484fb3cfa7f2) |
| 1241 $ cat >> $HGRCPATH <<EOF | 1241 $ cat >> $HGRCPATH <<EOF |
| 1242 > [experimental] | 1242 > [experimental] |
| 1243 > evolutioncommands=evolve | 1243 > evolutioncommands=evolve |
| 1244 > EOF | 1244 > EOF |
| 1245 $ hg --hidden up 15 | 1245 $ hg --hidden up 15 |
| 1246 updating to a hidden changeset daa1ff1c7fbd | |
| 1247 (hidden revision 'daa1ff1c7fbd' was rewritten as: 0c049e4e5422) | |
| 1246 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 1248 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 1247 updated to hidden changeset daa1ff1c7fbd | |
| 1248 (hidden revision 'daa1ff1c7fbd' was rewritten as: 0c049e4e5422) | |
| 1249 working directory parent is obsolete! (daa1ff1c7fbd) | 1249 working directory parent is obsolete! (daa1ff1c7fbd) |
| 1250 (use 'hg evolve' to update to its successor: 0c049e4e5422) | 1250 (use 'hg evolve' to update to its successor: 0c049e4e5422) |
| 1251 | 1251 |
| 1252 Restore all of the evolution features | 1252 Restore all of the evolution features |
| 1253 | 1253 |
| 1489 | 1489 |
| 1490 $ hg log -GT "{rev}:{node|short} {desc} {bookmarks}\n" | 1490 $ hg log -GT "{rev}:{node|short} {desc} {bookmarks}\n" |
| 1491 @ 1:ab832e43dd5a added a | 1491 @ 1:ab832e43dd5a added a |
| 1492 | 1492 |
| 1493 $ hg up f7ad41964313 --hidden | 1493 $ hg up f7ad41964313 --hidden |
| 1494 updating to a hidden changeset f7ad41964313 | |
| 1495 (hidden revision 'f7ad41964313' was rewritten as: ab832e43dd5a) | |
| 1494 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1496 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 1495 updated to hidden changeset f7ad41964313 | |
| 1496 (hidden revision 'f7ad41964313' was rewritten as: ab832e43dd5a) | |
| 1497 working directory parent is obsolete! (f7ad41964313) | 1497 working directory parent is obsolete! (f7ad41964313) |
| 1498 (use 'hg evolve' to update to its successor: ab832e43dd5a) | 1498 (use 'hg evolve' to update to its successor: ab832e43dd5a) |
| 1499 | 1499 |
| 1500 $ hg bookmark book | 1500 $ hg bookmark book |
| 1501 | 1501 |