--- a/tests/test-topic-tutorial.t Tue Aug 28 11:24:52 2018 +0200
+++ b/tests/test-topic-tutorial.t Mon Sep 03 22:06:12 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:
@@ -613,7 +613,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
@@ -790,9 +790,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
@@ -801,10 +801,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:
@@ -1120,10 +1120,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
===========================
@@ -1139,10 +1139,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`.
@@ -1155,10 +1155,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.
@@ -1169,23 +1169,23 @@
$ 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#`.
- $ hg update t1
+ $ hg update s1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ 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
---------------------------
@@ -1195,10 +1195,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
@@ -1206,7 +1206,7 @@
Understanding the current situation with hg log is not so easy, because
it shows too many things:
- $ hg log -G -r "t0::"
+ $ hg log -G -r "s0::"
@ changeset: 18:b7509bd417f8
| tag: tip
| topic: tools
@@ -1254,7 +1254,7 @@
#if docgraph-ext
- $ hg docgraph -r "t0::" --sphinx-directive --rankdir LR #rest-ignore
+ $ hg docgraph -r "s0::" --sphinx-directive --rankdir LR #rest-ignore
.. graphviz::
strict digraph "Mercurial graph" {
@@ -1357,13 +1357,13 @@
$ 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 `t2` and `t3` over the new `t1` without having
+do the necessary relocation of `s2` and `s3` over the new `s1` without having
to do that rebase by hand.:
$ hg next --evolve
@@ -1374,10 +1374,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:
@@ -1389,14 +1389,14 @@
$ 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:
- $ hg log -G -r "t0::"
+ $ hg log -G -r "s0::"
@ changeset: 20:bae3758e46bf
| tag: tip
| topic: tools
@@ -1435,7 +1435,7 @@
#if docgraph-ext
- $ hg docgraph -r "t0::" --sphinx-directive --rankdir LR #rest-ignore
+ $ hg docgraph -r "s0::" --sphinx-directive --rankdir LR #rest-ignore
.. graphviz::
strict digraph "Mercurial graph" {
@@ -1520,7 +1520,7 @@
Stack is also very helpful when you have a multi-headed stack:
- $ hg up t1
+ $ hg up s1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo "nails" > new_shopping
@@ -1532,12 +1532,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
@@ -1770,7 +1770,7 @@
}
#endif
- $ hg up t4
+ $ hg up s4
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg rebase
@@ -1782,11 +1782,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
=============================================
@@ -1857,11 +1857,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:
@@ -1897,9 +1897,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)