diff -r 1aa5f851d2c0 -r fb4801478d5d tests/test-topic-tutorial.t --- a/tests/test-topic-tutorial.t Mon Sep 03 16:41:32 2018 +0200 +++ b/tests/test-topic-tutorial.t Mon Sep 03 17:07:36 2018 +0200 @@ -252,9 +252,9 @@ $ hg stack ### topic: food ### target: default (branch) - t2@ adding fruits (current) - t1: adding condiments - t0^ Shopping list (base) + s2@ adding fruits (current) + s1: adding condiments + s0^ Shopping list (base) The topic deactivates when we update away from it: @@ -614,7 +614,7 @@ ### topic: food ### target: default (branch) (stack is empty) - t0^ adding fruits (base current) + s0^ adding fruits (base current) $ hg log --graph @ changeset: 5:2d50db8b5b4c @@ -791,9 +791,9 @@ $ hg stack ### topic: drinks ### target: default (branch) - t2@ Adding orange juice (current) - t1: Adding apple juice - t0^ adding fruits (base) + s2@ Adding orange juice (current) + s1: Adding apple juice + s0^ adding fruits (base) $ hg update tools switching to topic tools @@ -802,10 +802,10 @@ $ hg stack ### topic: tools ### target: default (branch) - t3@ Adding drill (current) - t2: Adding saw - t1: Adding hammer - t0^ adding fruits (base) + s3@ Adding drill (current) + s2: Adding saw + s1: Adding hammer + s0^ adding fruits (base) They are seen as independent branches by Mercurial. No rebase or merge between them will be attempted by default: @@ -1121,10 +1121,10 @@ $ hg stack ### topic: tools ### target: default (branch), 2 behind - t3@ Adding drill (current) - t2: Adding saw - t1: Adding hammer - t0^ add a pair of shoes (base) + s3@ Adding drill (current) + s2: Adding saw + s1: Adding hammer + s0^ add a pair of shoes (base) Working Within Your Stack =========================== @@ -1140,10 +1140,10 @@ $ hg stack ### topic: tools ### target: default (branch), 2 behind - t3@ Adding drill (current) - t2: Adding saw - t1: Adding hammer - t0^ add a pair of shoes (base) + s3@ Adding drill (current) + s2: Adding saw + s1: Adding hammer + s0^ add a pair of shoes (base) You can navigate in your current stack with `previous` and `next`. @@ -1156,10 +1156,10 @@ $ hg stack ### topic: tools ### target: default (branch), 2 behind - t3: Adding drill - t2@ Adding saw (current) - t1: Adding hammer - t0^ add a pair of shoes (base) + s3: Adding drill + s2@ Adding saw (current) + s1: Adding hammer + s0^ add a pair of shoes (base) `next` will move you forward to the topic head. @@ -1170,10 +1170,10 @@ $ hg stack ### topic: tools ### target: default (branch), 2 behind - t3@ Adding drill (current) - t2: Adding saw - t1: Adding hammer - t0^ add a pair of shoes (base) + s3@ Adding drill (current) + s2: Adding saw + s1: Adding hammer + s0^ add a pair of shoes (base) You can also directly jump to a changeset within your stack with the revset `t#`. @@ -1183,10 +1183,10 @@ $ hg stack ### topic: tools ### target: default (branch), 2 behind - t3: Adding drill - t2: Adding saw - t1@ Adding hammer (current) - t0^ add a pair of shoes (base) + s3: Adding drill + s2: Adding saw + s1@ Adding hammer (current) + s0^ add a pair of shoes (base) Editing your work mid-stack --------------------------- @@ -1196,10 +1196,10 @@ $ hg stack ### topic: tools ### target: default (branch), 2 behind - t3: Adding drill - t2: Adding saw - t1@ Adding hammer (current) - t0^ add a pair of shoes (base) + s3: Adding drill + s2: Adding saw + s1@ Adding hammer (current) + s0^ add a pair of shoes (base) $ hg amend -m "Adding hammer to the shopping list" 2 new orphan changesets @@ -1358,10 +1358,10 @@ $ hg stack ### topic: tools ### target: default (branch), 2 behind - t3$ Adding drill (unstable) - t2$ Adding saw (unstable) - t1@ Adding hammer to the shopping list (current) - t0^ add a pair of shoes (base) + s3$ Adding drill (unstable) + s2$ Adding saw (unstable) + s1@ Adding hammer to the shopping list (current) + s0^ add a pair of shoes (base) It's easy to stabilize the situation, `next` has an `--evolve` option. It will do the necessary relocation of `s2` and `s3` over the new `s1` without having @@ -1375,10 +1375,10 @@ $ hg stack ### topic: tools ### target: default (branch), 2 behind - t3$ Adding drill (unstable) - t2@ Adding saw (current) - t1: Adding hammer to the shopping list - t0^ add a pair of shoes (base) + s3$ Adding drill (unstable) + s2@ Adding saw (current) + s1: Adding hammer to the shopping list + s0^ add a pair of shoes (base) One more to go: @@ -1390,10 +1390,10 @@ $ hg stack ### topic: tools ### target: default (branch), 2 behind - t3@ Adding drill (current) - t2: Adding saw - t1: Adding hammer to the shopping list - t0^ add a pair of shoes (base) + s3@ Adding drill (current) + s2: Adding saw + s1: Adding hammer to the shopping list + s0^ add a pair of shoes (base) Let's take a look at `hg log` once again: @@ -1533,12 +1533,12 @@ $ hg stack ### topic: tools (2 heads) ### target: default (branch), 2 behind - t4: Adding drill - t3: Adding saw - t1^ Adding hammer to the shopping list (base) - t2@ Adding nails (current) - t1: Adding hammer to the shopping list - t0^ add a pair of shoes (base) + s4: Adding drill + s3: Adding saw + s1^ Adding hammer to the shopping list (base) + s2@ Adding nails (current) + s1: Adding hammer to the shopping list + s0^ add a pair of shoes (base) Solving this situation is easy with a topic: use merge or rebase. Merge within a multi-headed stack will use the other topic head as @@ -1783,11 +1783,11 @@ $ hg stack ### topic: tools ### target: default (branch), 2 behind - t4@ Adding drill (current) - t3: Adding saw - t2: Adding nails - t1: Adding hammer to the shopping list - t0^ add a pair of shoes (base) + s4@ Adding drill (current) + s3: Adding saw + s2: Adding nails + s1: Adding hammer to the shopping list + s0^ add a pair of shoes (base) Collaborating through a non-publishing server ============================================= @@ -1858,11 +1858,11 @@ $ hg stack ### topic: tools ### target: default (branch), 2 behind - t4@ Adding drill (current) - t3: Adding saw - t2: Adding nails - t1: Adding hammer to the shopping list - t0^ add a pair of shoes (base) + s4@ Adding drill (current) + s3: Adding saw + s2: Adding nails + s1: Adding hammer to the shopping list + s0^ add a pair of shoes (base) We can also add new changesets and share them: @@ -1898,9 +1898,9 @@ $ hg stack ### topic: tools ### target: default (branch), 2 behind - t5@ Adding screws (current) - t4: Adding drill - t3: Adding saw - t2: Adding nails - t1: Adding hammer to the shopping list - t0^ add a pair of shoes (base) + s5@ Adding screws (current) + s4: Adding drill + s3: Adding saw + s2: Adding nails + s1: Adding hammer to the shopping list + s0^ add a pair of shoes (base)