Mercurial > evolve
comparison tests/test-evolve.t @ 3923:257481642686 mercurial-4.6
test-compat: merge stable into mercurial-4.6
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 02 Aug 2018 01:57:13 +0200 |
| parents | f7afd3a158e3 |
| children | d00f0c369bc7 85c99079d41f |
comparison
equal
deleted
inserted
replaced
| 3922:9839463088ac | 3923:257481642686 |
|---|---|
| 1252 [255] | 1252 [255] |
| 1253 | 1253 |
| 1254 Shows "use 'hg evolve' to..." hints iff the evolve command is enabled | 1254 Shows "use 'hg evolve' to..." hints iff the evolve command is enabled |
| 1255 | 1255 |
| 1256 $ hg --hidden up 14 | 1256 $ hg --hidden up 14 |
| 1257 updating to a hidden changeset 484fb3cfa7f2 | |
| 1258 (hidden revision '484fb3cfa7f2' was rewritten as: 98e171e2f272) | |
| 1257 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | 1259 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 1258 updated to hidden changeset 484fb3cfa7f2 | |
| 1259 (hidden revision '484fb3cfa7f2' was rewritten as: 98e171e2f272) | |
| 1260 working directory parent is obsolete! (484fb3cfa7f2) | 1260 working directory parent is obsolete! (484fb3cfa7f2) |
| 1261 $ cat >> $HGRCPATH <<EOF | 1261 $ cat >> $HGRCPATH <<EOF |
| 1262 > [experimental] | 1262 > [experimental] |
| 1263 > evolutioncommands=evolve | 1263 > evolutioncommands=evolve |
| 1264 > EOF | 1264 > EOF |
| 1265 $ hg --hidden up 15 | 1265 $ hg --hidden up 15 |
| 1266 updating to a hidden changeset daa1ff1c7fbd | |
| 1267 (hidden revision 'daa1ff1c7fbd' was rewritten as: 0c049e4e5422) | |
| 1266 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 1268 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 1267 updated to hidden changeset daa1ff1c7fbd | |
| 1268 (hidden revision 'daa1ff1c7fbd' was rewritten as: 0c049e4e5422) | |
| 1269 working directory parent is obsolete! (daa1ff1c7fbd) | 1269 working directory parent is obsolete! (daa1ff1c7fbd) |
| 1270 (use 'hg evolve' to update to its successor: 0c049e4e5422) | 1270 (use 'hg evolve' to update to its successor: 0c049e4e5422) |
| 1271 | 1271 |
| 1272 Restore all of the evolution features | 1272 Restore all of the evolution features |
| 1273 | 1273 |
| 1573 | 1573 |
| 1574 $ hg log -GT "{rev}:{node|short} {desc} {bookmarks}\n" | 1574 $ hg log -GT "{rev}:{node|short} {desc} {bookmarks}\n" |
| 1575 @ 1:ab832e43dd5a added a | 1575 @ 1:ab832e43dd5a added a |
| 1576 | 1576 |
| 1577 $ hg up f7ad41964313 --hidden | 1577 $ hg up f7ad41964313 --hidden |
| 1578 updating to a hidden changeset f7ad41964313 | |
| 1579 (hidden revision 'f7ad41964313' was rewritten as: ab832e43dd5a) | |
| 1578 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1580 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 1579 updated to hidden changeset f7ad41964313 | |
| 1580 (hidden revision 'f7ad41964313' was rewritten as: ab832e43dd5a) | |
| 1581 working directory parent is obsolete! (f7ad41964313) | 1581 working directory parent is obsolete! (f7ad41964313) |
| 1582 (use 'hg evolve' to update to its successor: ab832e43dd5a) | 1582 (use 'hg evolve' to update to its successor: ab832e43dd5a) |
| 1583 | 1583 |
| 1584 $ hg bookmark book | 1584 $ hg bookmark book |
| 1585 | 1585 |