evolve: comparison tests/test-topic-tutorial.t

equal deleted inserted replaced

-:9a2db13b2e99
+:dc247e648f43
 command:
 $ hg stack
 ### topic: food
 ### target: default (branch)
-t2@ adding fruits (current)
+s2@ adding fruits (current)
-t1: adding condiments
+s1: adding condiments
-t0^ Shopping list (base)
+s0^ Shopping list (base)
 The topic deactivates when we update away from it:
 $ hg update default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ hg topics --list
 ### topic: food
 ### target: default (branch)
 (stack is empty)
-t0^ adding fruits (base current)
+s0^ adding fruits (base current)
 $ hg log --graph
 @  changeset:   5:2d50db8b5b4c
 |  tag:         tip
 |  user:        test
 The information displayed by ``hg stack`` adapts to the active topic:
 $ hg stack
 ### topic: drinks
 ### target: default (branch)
-t2@ Adding orange juice (current)
+s2@ Adding orange juice (current)
-t1: Adding apple juice
+s1: Adding apple juice
-t0^ adding fruits (base)
+s0^ adding fruits (base)
 $ hg update tools
 switching to topic tools
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ hg stack
 ### topic: tools
 ### target: default (branch)
-t3@ Adding drill (current)
+s3@ Adding drill (current)
-t2: Adding saw
+s2: Adding saw
-t1: Adding hammer
+s1: Adding hammer
-t0^ adding fruits (base)
+s0^ adding fruits (base)
 They are seen as independent branches by Mercurial. No rebase or merge
 between them will be attempted by default:
 $ hg rebase
 * tools (on branch: default, 3 changesets, 2 behind)
 $ hg stack
 ### topic: tools
 ### target: default (branch), 2 behind
-t3@ Adding drill (current)
+s3@ Adding drill (current)
-t2: Adding saw
+s2: Adding saw
-t1: Adding hammer
+s1: Adding hammer
-t0^ add a pair of shoes (base)
+s0^ add a pair of shoes (base)
 Working Within Your Stack
 ===========================
 Navigating within your stack
 * tools (on branch: default, 3 changesets, 2 behind)
 $ hg stack
 ### topic: tools
 ### target: default (branch), 2 behind
-t3@ Adding drill (current)
+s3@ Adding drill (current)
-t2: Adding saw
+s2: Adding saw
-t1: Adding hammer
+s1: Adding hammer
-t0^ add a pair of shoes (base)
+s0^ add a pair of shoes (base)
 You can navigate in your current stack with `previous` and `next`.
 `previous` will bring you back to the parent of the topic head.
 [14] Adding saw
 $ hg stack
 ### topic: tools
 ### target: default (branch), 2 behind
-t3: Adding drill
+s3: Adding drill
-t2@ Adding saw (current)
+s2@ Adding saw (current)
-t1: Adding hammer
+s1: Adding hammer
-t0^ add a pair of shoes (base)
+s0^ add a pair of shoes (base)
 `next` will move you forward to the topic head.
 $ hg next
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 [15] Adding drill
 $ hg stack
 ### topic: tools
 ### target: default (branch), 2 behind
-t3@ Adding drill (current)
+s3@ Adding drill (current)
-t2: Adding saw
+s2: Adding saw
-t1: Adding hammer
+s1: Adding hammer
-t0^ add a pair of shoes (base)
+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
+s3: Adding drill
-t2: Adding saw
+s2: Adding saw
-t1@ Adding hammer (current)
+s1@ Adding hammer (current)
-t0^ add a pair of shoes (base)
+s0^ add a pair of shoes (base)
 Editing your work mid-stack
 ---------------------------
 It's easy to edit your work inside your stack:
 $ hg stack
 ### topic: tools
 ### target: default (branch), 2 behind
-t3: Adding drill
+s3: Adding drill
-t2: Adding saw
+s2: Adding saw
-t1@ Adding hammer (current)
+s1@ Adding hammer (current)
-t0^ add a pair of shoes (base)
+s0^ add a pair of shoes (base)
 $ hg amend -m "Adding hammer to the shopping list"
 2 new orphan changesets
 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
 |  parent:      12:fbff9bc37a43
 |  user:        test
 ~  date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     add a pair of shoes
 #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" {
 	graph [rankdir=LR,
 		splines=polyline
 Fortunately stack shows you a better visualization:
 $ hg stack
 ### topic: tools
 ### target: default (branch), 2 behind
-t3$ Adding drill (unstable)
+s3$ Adding drill (unstable)
-t2$ Adding saw (unstable)
+s2$ Adding saw (unstable)
-t1@ Adding hammer to the shopping list (current)
+s1@ Adding hammer to the shopping list (current)
-t0^ add a pair of shoes (base)
+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
 move:[14] Adding saw
 atop:[18] Adding hammer to the shopping list
 working directory now at d5c51ee5762a
 $ hg stack
 ### topic: tools
 ### target: default (branch), 2 behind
-t3$ Adding drill (unstable)
+s3$ Adding drill (unstable)
-t2@ Adding saw (current)
+s2@ Adding saw (current)
-t1: Adding hammer to the shopping list
+s1: Adding hammer to the shopping list
-t0^ add a pair of shoes (base)
+s0^ add a pair of shoes (base)
 One more to go:
 $ hg next --evolve
 move:[15] Adding drill
 working directory now at bae3758e46bf
 $ hg stack
 ### topic: tools
 ### target: default (branch), 2 behind
-t3@ Adding drill (current)
+s3@ Adding drill (current)
-t2: Adding saw
+s2: Adding saw
-t1: Adding hammer to the shopping list
+s1: Adding hammer to the shopping list
-t0^ add a pair of shoes (base)
+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
 |  user:        test
 |  date:        Thu Jan 01 00:00:00 1970 +0000
 ~  date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     add a pair of shoes
 #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" {
 	graph [rankdir=LR,
 		splines=polyline
 Multi-headed stack
 ------------------
 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
 $ cat shopping >> new_shopping
 $ mv new_shopping shopping
 $ hg commit -m 'Adding nails'
 $ hg stack
 ### topic: tools (2 heads)
 ### target: default (branch), 2 behind
-t4: Adding drill
+s4: Adding drill
-t3: Adding saw
+s3: Adding saw
-t1^ Adding hammer to the shopping list (base)
+s1^ Adding hammer to the shopping list (base)
-t2@ Adding nails (current)
+s2@ Adding nails (current)
-t1: Adding hammer to the shopping list
+s1: Adding hammer to the shopping list
-t0^ add a pair of shoes (base)
+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
 destination if the topic has two heads. But rebasing will yield a
 completely linear history so it's what we will do.
 	19 -> 20	 [arrowhead=none,
 		penwidth=2.0];
 }
 #endif
-$ hg up t4
+$ hg up s4
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ hg rebase
 rebasing 19:d5c51ee5762a "Adding saw" (tools)
 merging shopping
 merging shopping
 $ hg stack
 ### topic: tools
 ### target: default (branch), 2 behind
-t4@ Adding drill (current)
+s4@ Adding drill (current)
-t3: Adding saw
+s3: Adding saw
-t2: Adding nails
+s2: Adding nails
-t1: Adding hammer to the shopping list
+s1: Adding hammer to the shopping list
-t0^ add a pair of shoes (base)
+s0^ add a pair of shoes (base)
 Collaborating through a non-publishing server
 =============================================
 .. setup:
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ hg stack
 ### topic: tools
 ### target: default (branch), 2 behind
-t4@ Adding drill (current)
+s4@ Adding drill (current)
-t3: Adding saw
+s3: Adding saw
-t2: Adding nails
+s2: Adding nails
-t1: Adding hammer to the shopping list
+s1: Adding hammer to the shopping list
-t0^ add a pair of shoes (base)
+s0^ add a pair of shoes (base)
 We can also add new changesets and share them:
 $ echo screws >> shopping
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ hg stack
 ### topic: tools
 ### target: default (branch), 2 behind
-t5@ Adding screws (current)
+s5@ Adding screws (current)
-t4: Adding drill
+s4: Adding drill
-t3: Adding saw
+s3: Adding saw
-t2: Adding nails
+s2: Adding nails
-t1: Adding hammer to the shopping list
+s1: Adding hammer to the shopping list
-t0^ add a pair of shoes (base)
+s0^ add a pair of shoes (base)

branch	mercurial-4.5
changeset 4075	dc247e648f43
parent 3924	f3713d41b85b
parent 4067	fb4801478d5d
child 4076	f9a850018daa
child 4172	35c21ab64420