Mercurial > evolve
comparison tests/test-evolve.t @ 4513:d70db7e455dc mercurial-4.6
test-compat: merge mercurial-4.7 into mercurial-4.6
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 11 Apr 2019 22:42:13 +0200 |
| parents | 522abf1d70b7 7a779a288793 |
| children | f54bb6eaf5e6 3ef4980353af |
comparison
equal
deleted
inserted
replaced
| 4512:7a779a288793 | 4513:d70db7e455dc |
|---|---|
| 1248 [255] | 1248 [255] |
| 1249 | 1249 |
| 1250 Shows "use 'hg evolve' to..." hints iff the evolve command is enabled | 1250 Shows "use 'hg evolve' to..." hints iff the evolve command is enabled |
| 1251 | 1251 |
| 1252 $ hg --hidden up 14 | 1252 $ hg --hidden up 14 |
| 1253 updating to a hidden changeset 484fb3cfa7f2 | |
| 1254 (hidden revision '484fb3cfa7f2' was rewritten as: 98e171e2f272) | |
| 1253 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | 1255 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 1254 updated to hidden changeset 484fb3cfa7f2 | |
| 1255 (hidden revision '484fb3cfa7f2' was rewritten as: 98e171e2f272) | |
| 1256 working directory parent is obsolete! (484fb3cfa7f2) | 1256 working directory parent is obsolete! (484fb3cfa7f2) |
| 1257 $ cat >> $HGRCPATH <<EOF | 1257 $ cat >> $HGRCPATH <<EOF |
| 1258 > [experimental] | 1258 > [experimental] |
| 1259 > evolutioncommands=evolve | 1259 > evolutioncommands=evolve |
| 1260 > EOF | 1260 > EOF |
| 1261 $ hg --hidden up 15 | 1261 $ hg --hidden up 15 |
| 1262 updating to a hidden changeset daa1ff1c7fbd | |
| 1263 (hidden revision 'daa1ff1c7fbd' was rewritten as: 0c049e4e5422) | |
| 1262 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 1264 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 1263 updated to hidden changeset daa1ff1c7fbd | |
| 1264 (hidden revision 'daa1ff1c7fbd' was rewritten as: 0c049e4e5422) | |
| 1265 working directory parent is obsolete! (daa1ff1c7fbd) | 1265 working directory parent is obsolete! (daa1ff1c7fbd) |
| 1266 (use 'hg evolve' to update to its successor: 0c049e4e5422) | 1266 (use 'hg evolve' to update to its successor: 0c049e4e5422) |
| 1267 | 1267 |
| 1268 Restore all of the evolution features | 1268 Restore all of the evolution features |
| 1269 | 1269 |
| 1567 | 1567 |
| 1568 $ hg log -GT "{rev}:{node|short} {desc} {bookmarks}\n" | 1568 $ hg log -GT "{rev}:{node|short} {desc} {bookmarks}\n" |
| 1569 @ 1:ab832e43dd5a added a | 1569 @ 1:ab832e43dd5a added a |
| 1570 | 1570 |
| 1571 $ hg up f7ad41964313 --hidden | 1571 $ hg up f7ad41964313 --hidden |
| 1572 updating to a hidden changeset f7ad41964313 | |
| 1573 (hidden revision 'f7ad41964313' was rewritten as: ab832e43dd5a) | |
| 1572 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1574 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 1573 updated to hidden changeset f7ad41964313 | |
| 1574 (hidden revision 'f7ad41964313' was rewritten as: ab832e43dd5a) | |
| 1575 working directory parent is obsolete! (f7ad41964313) | 1575 working directory parent is obsolete! (f7ad41964313) |
| 1576 (use 'hg evolve' to update to its successor: ab832e43dd5a) | 1576 (use 'hg evolve' to update to its successor: ab832e43dd5a) |
| 1577 | 1577 |
| 1578 $ hg bookmark book | 1578 $ hg bookmark book |
| 1579 | 1579 |