989 $ glog |
989 $ glog |
990 @ 10:d952e93add6f@mybranch(draft) a2 |
990 @ 10:d952e93add6f@mybranch(draft) a2 |
991 | |
991 | |
992 o 9:9f8b83c2e7f3@default(draft) a1__ |
992 o 9:9f8b83c2e7f3@default(draft) a1__ |
993 | |
993 | |
994 | * 8:777c26ca5e78@mybranch(draft) a3 |
994 | o 8:777c26ca5e78@mybranch(draft) a3 |
995 | | |
995 | | |
996 | x 7:eb07e22a0e63@mybranch(draft) a2 |
996 | x 7:eb07e22a0e63@mybranch(draft) a2 |
997 | | |
997 | | |
998 | x 6:faafc6cea0ba@default(draft) a1_ |
998 | x 6:faafc6cea0ba@default(draft) a1_ |
999 |/ |
999 |/ |
1109 $ hg amend |
1109 $ hg amend |
1110 2 new orphan changesets |
1110 2 new orphan changesets |
1111 $ glog |
1111 $ glog |
1112 @ 16:0cf3707e8971@default(draft) a3 |
1112 @ 16:0cf3707e8971@default(draft) a3 |
1113 | |
1113 | |
1114 | * 15:daa1ff1c7fbd@default(draft) add gh |
1114 | o 15:daa1ff1c7fbd@default(draft) add gh |
1115 | | |
1115 | | |
1116 | | * 14:484fb3cfa7f2@default(draft) add gg |
1116 | | o 14:484fb3cfa7f2@default(draft) add gg |
1117 | |/ |
1117 | |/ |
1118 | x 13:b88539ad24d7@default(draft) a3 |
1118 | x 13:b88539ad24d7@default(draft) a3 |
1119 |/ |
1119 |/ |
1120 o 12:a8bb31d4b7f2@default(draft) phase-divergent update to d952e93add6f: |
1120 o 12:a8bb31d4b7f2@default(draft) phase-divergent update to d952e93add6f: |
1121 | |
1121 | |
1251 [255] |
1251 [255] |
1252 |
1252 |
1253 Shows "use 'hg evolve' to..." hints iff the evolve command is enabled |
1253 Shows "use 'hg evolve' to..." hints iff the evolve command is enabled |
1254 |
1254 |
1255 $ hg --hidden up 14 |
1255 $ hg --hidden up 14 |
1256 updating to a hidden changeset 484fb3cfa7f2 |
|
1257 (hidden revision '484fb3cfa7f2' was rewritten as: 98e171e2f272) |
|
1258 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1256 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1259 working directory parent is obsolete! (484fb3cfa7f2) |
1257 working directory parent is obsolete! (484fb3cfa7f2) |
1260 $ cat >> $HGRCPATH <<EOF |
1258 $ cat >> $HGRCPATH <<EOF |
1261 > [experimental] |
1259 > [experimental] |
1262 > evolutioncommands=evolve |
1260 > evolutioncommands=evolve |
1263 > EOF |
1261 > EOF |
1264 $ hg --hidden up 15 |
1262 $ hg --hidden up 15 |
1265 updating to a hidden changeset daa1ff1c7fbd |
|
1266 (hidden revision 'daa1ff1c7fbd' was rewritten as: 0c049e4e5422) |
|
1267 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1263 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1268 working directory parent is obsolete! (daa1ff1c7fbd) |
1264 working directory parent is obsolete! (daa1ff1c7fbd) |
1269 (use 'hg evolve' to update to its successor: 0c049e4e5422) |
1265 (use 'hg evolve' to update to its successor: 0c049e4e5422) |
1270 |
1266 |
1271 Restore all of the evolution features |
1267 Restore all of the evolution features |
1288 $ hg amend |
1284 $ hg amend |
1289 2 new orphan changesets |
1285 2 new orphan changesets |
1290 $ glog -r "0cf3707e8971::" |
1286 $ glog -r "0cf3707e8971::" |
1291 @ 22:274b6cd0c101@default(draft) add j1 |
1287 @ 22:274b6cd0c101@default(draft) add j1 |
1292 | |
1288 | |
1293 | * 21:89e4f7e8feb5@default(draft) add j3 |
1289 | o 21:89e4f7e8feb5@default(draft) add j3 |
1294 | | |
1290 | | |
1295 | * 20:4cd61236beca@default(draft) add j2 |
1291 | o 20:4cd61236beca@default(draft) add j2 |
1296 | | |
1292 | | |
1297 | x 19:0fd8bfb02de4@default(draft) add j1 |
1293 | x 19:0fd8bfb02de4@default(draft) add j1 |
1298 |/ |
1294 |/ |
1299 | o 18:0c049e4e5422@default(draft) add gh |
1295 | o 18:0c049e4e5422@default(draft) add gh |
1300 | | |
1296 | | |
1328 new changeset is empty |
1324 new changeset is empty |
1329 (use 'hg prune .' to remove it) |
1325 (use 'hg prune .' to remove it) |
1330 $ glog -r "0cf3707e8971::" |
1326 $ glog -r "0cf3707e8971::" |
1331 @ 23:0ef9ff75f8e2@default(draft) add j1 |
1327 @ 23:0ef9ff75f8e2@default(draft) add j1 |
1332 | |
1328 | |
1333 | * 21:89e4f7e8feb5@default(draft) add j3 |
1329 | o 21:89e4f7e8feb5@default(draft) add j3 |
1334 | | |
1330 | | |
1335 | * 20:4cd61236beca@default(draft) add j2 |
1331 | o 20:4cd61236beca@default(draft) add j2 |
1336 | | |
1332 | | |
1337 | x 19:0fd8bfb02de4@default(draft) add j1 |
1333 | x 19:0fd8bfb02de4@default(draft) add j1 |
1338 |/ |
1334 |/ |
1339 | o 18:0c049e4e5422@default(draft) add gh |
1335 | o 18:0c049e4e5422@default(draft) add gh |
1340 | | |
1336 | | |
1461 $ glog -r "0cf3707e8971::" |
1457 $ glog -r "0cf3707e8971::" |
1462 @ 32:c7dbf668e9d5@default(draft) _pp |
1458 @ 32:c7dbf668e9d5@default(draft) _pp |
1463 | |
1459 | |
1464 o 31:2b5a32114b3d@default(draft) _oo |
1460 o 31:2b5a32114b3d@default(draft) _oo |
1465 | |
1461 | |
1466 | * 30:4d122571f3b6@default(draft) add uu |
1462 | o 30:4d122571f3b6@default(draft) add uu |
1467 | | |
1463 | | |
1468 | x 29:7da3e73df8a5@default(draft) oo+pp |
1464 | x 29:7da3e73df8a5@default(draft) oo+pp |
1469 |/ |
1465 |/ |
1470 | o 28:92ca6f3984de@default(draft) add gg |
1466 | o 28:92ca6f3984de@default(draft) add gg |
1471 | | |
1467 | | |
1570 |
1566 |
1571 $ hg log -GT "{rev}:{node|short} {desc} {bookmarks}\n" |
1567 $ hg log -GT "{rev}:{node|short} {desc} {bookmarks}\n" |
1572 @ 1:ab832e43dd5a added a |
1568 @ 1:ab832e43dd5a added a |
1573 |
1569 |
1574 $ hg up f7ad41964313 --hidden |
1570 $ hg up f7ad41964313 --hidden |
1575 updating to a hidden changeset f7ad41964313 |
|
1576 (hidden revision 'f7ad41964313' was rewritten as: ab832e43dd5a) |
|
1577 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1571 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1578 working directory parent is obsolete! (f7ad41964313) |
1572 working directory parent is obsolete! (f7ad41964313) |
1579 (use 'hg evolve' to update to its successor: ab832e43dd5a) |
1573 (use 'hg evolve' to update to its successor: ab832e43dd5a) |
1580 |
1574 |
1581 $ hg bookmark book |
1575 $ hg bookmark book |