Mercurial > evolve
comparison tests/test-evolve.t @ 4784:ecf0f3bc7468 mercurial-4.6
test-compat: merge mercurial-4.7 into mercurial-4.6
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 29 Jul 2019 14:43:17 +0200 |
| parents | c6fc1000af1e 5d50f3de4714 |
| children | 1752a2e7a226 |
comparison
equal
deleted
inserted
replaced
| 4783:5d50f3de4714 | 4784:ecf0f3bc7468 |
|---|---|
| 1238 [255] | 1238 [255] |
| 1239 | 1239 |
| 1240 Shows "use 'hg evolve' to..." hints iff the evolve command is enabled | 1240 Shows "use 'hg evolve' to..." hints iff the evolve command is enabled |
| 1241 | 1241 |
| 1242 $ hg --hidden up 14 | 1242 $ hg --hidden up 14 |
| 1243 updating to a hidden changeset 484fb3cfa7f2 | |
| 1244 (hidden revision '484fb3cfa7f2' was rewritten as: 98e171e2f272) | |
| 1243 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1245 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 1244 updated to hidden changeset 484fb3cfa7f2 | |
| 1245 (hidden revision '484fb3cfa7f2' was rewritten as: 98e171e2f272) | |
| 1246 working directory parent is obsolete! (484fb3cfa7f2) | 1246 working directory parent is obsolete! (484fb3cfa7f2) |
| 1247 $ cat >> $HGRCPATH <<EOF | 1247 $ cat >> $HGRCPATH <<EOF |
| 1248 > [experimental] | 1248 > [experimental] |
| 1249 > evolutioncommands=evolve | 1249 > evolutioncommands=evolve |
| 1250 > EOF | 1250 > EOF |
| 1251 $ hg --hidden up 15 | 1251 $ hg --hidden up 15 |
| 1252 updating to a hidden changeset daa1ff1c7fbd | |
| 1253 (hidden revision 'daa1ff1c7fbd' was rewritten as: 0c049e4e5422) | |
| 1252 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 1254 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 1253 updated to hidden changeset daa1ff1c7fbd | |
| 1254 (hidden revision 'daa1ff1c7fbd' was rewritten as: 0c049e4e5422) | |
| 1255 working directory parent is obsolete! (daa1ff1c7fbd) | 1255 working directory parent is obsolete! (daa1ff1c7fbd) |
| 1256 (use 'hg evolve' to update to its successor: 0c049e4e5422) | 1256 (use 'hg evolve' to update to its successor: 0c049e4e5422) |
| 1257 | 1257 |
| 1258 Restore all of the evolution features | 1258 Restore all of the evolution features |
| 1259 | 1259 |
| 1495 | 1495 |
| 1496 $ hg log -GT "{rev}:{node|short} {desc} {bookmarks}\n" | 1496 $ hg log -GT "{rev}:{node|short} {desc} {bookmarks}\n" |
| 1497 @ 1:ab832e43dd5a added a | 1497 @ 1:ab832e43dd5a added a |
| 1498 | 1498 |
| 1499 $ hg up f7ad41964313 --hidden | 1499 $ hg up f7ad41964313 --hidden |
| 1500 updating to a hidden changeset f7ad41964313 | |
| 1501 (hidden revision 'f7ad41964313' was rewritten as: ab832e43dd5a) | |
| 1500 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1502 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 1501 updated to hidden changeset f7ad41964313 | |
| 1502 (hidden revision 'f7ad41964313' was rewritten as: ab832e43dd5a) | |
| 1503 working directory parent is obsolete! (f7ad41964313) | 1503 working directory parent is obsolete! (f7ad41964313) |
| 1504 (use 'hg evolve' to update to its successor: ab832e43dd5a) | 1504 (use 'hg evolve' to update to its successor: ab832e43dd5a) |
| 1505 | 1505 |
| 1506 $ hg bookmark book | 1506 $ hg bookmark book |
| 1507 | 1507 |