Mercurial > evolve
diff tests/test-topic-tutorial.t @ 2997:a61634f52742
topic: try to clarify the "branch" part in stack
The idea is to clarify the meaning of "behind" with using the "target" word.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Sun, 24 Sep 2017 11:30:14 +0200 |
parents | 62201935e1a7 |
children | bd7e8be29542 |
line wrap: on
line diff
--- a/tests/test-topic-tutorial.t Tue Sep 26 13:01:21 2017 +0200 +++ b/tests/test-topic-tutorial.t Sun Sep 24 11:30:14 2017 +0200 @@ -248,7 +248,7 @@ $ hg stack ### topic: food - ### branch: default + ### target: default (branch) t2@ adding fruits (current) t1: adding condiments t0^ Shopping list (base) @@ -595,7 +595,7 @@ $ hg topics --list ### topic: food - ### branch: default + ### target: default (branch) (stack is empty) t0^ adding fruits (base) @@ -771,7 +771,7 @@ $ hg stack ### topic: drinks - ### branch: default + ### target: default (branch) t2@ Adding orange juice (current) t1: Adding apple juice t0^ adding fruits (base) @@ -782,7 +782,7 @@ $ hg stack ### topic: tools - ### branch: default + ### target: default (branch) t3@ Adding drill (current) t2: Adding saw t1: Adding hammer @@ -1100,7 +1100,7 @@ $ hg stack ### topic: tools - ### branch: default, 2 behind + ### target: default (branch), 2 behind t3@ Adding drill (current) t2: Adding saw t1: Adding hammer @@ -1119,7 +1119,7 @@ $ hg stack ### topic: tools - ### branch: default, 2 behind + ### target: default (branch), 2 behind t3@ Adding drill (current) t2: Adding saw t1: Adding hammer @@ -1135,7 +1135,7 @@ $ hg stack ### topic: tools - ### branch: default, 2 behind + ### target: default (branch), 2 behind t3: Adding drill t2@ Adding saw (current) t1: Adding hammer @@ -1149,7 +1149,7 @@ $ hg stack ### topic: tools - ### branch: default, 2 behind + ### target: default (branch), 2 behind t3@ Adding drill (current) t2: Adding saw t1: Adding hammer @@ -1162,7 +1162,7 @@ $ hg stack ### topic: tools - ### branch: default, 2 behind + ### target: default (branch), 2 behind t3: Adding drill t2: Adding saw t1@ Adding hammer (current) @@ -1175,7 +1175,7 @@ $ hg stack ### topic: tools - ### branch: default, 2 behind + ### target: default (branch), 2 behind t3: Adding drill t2: Adding saw t1@ Adding hammer (current) @@ -1336,7 +1336,7 @@ $ hg stack ### topic: tools - ### branch: default, 2 behind + ### target: default (branch), 2 behind t3$ Adding drill (unstable) t2$ Adding saw (unstable) t1@ Adding hammer to the shopping list (current) @@ -1353,7 +1353,7 @@ $ hg stack ### topic: tools - ### branch: default, 2 behind + ### target: default (branch), 2 behind t3$ Adding drill (unstable) t2@ Adding saw (current) t1: Adding hammer to the shopping list @@ -1368,7 +1368,7 @@ $ hg stack ### topic: tools - ### branch: default, 2 behind + ### target: default (branch), 2 behind t3@ Adding drill (current) t2: Adding saw t1: Adding hammer to the shopping list @@ -1511,7 +1511,7 @@ $ hg stack ### topic: tools (2 heads) - ### branch: default, 2 behind + ### target: default (branch), 2 behind t4: Adding drill t3: Adding saw t1^ Adding hammer to the shopping list (base) @@ -1761,7 +1761,7 @@ $ hg stack ### topic: tools - ### branch: default, 2 behind + ### target: default (branch), 2 behind t4@ Adding drill (current) t3: Adding saw t2: Adding nails @@ -1835,7 +1835,7 @@ $ hg stack ### topic: tools - ### branch: default, 2 behind + ### target: default (branch), 2 behind t4@ Adding drill (current) t3: Adding saw t2: Adding nails @@ -1874,7 +1874,7 @@ $ hg stack ### topic: tools - ### branch: default, 2 behind + ### target: default (branch), 2 behind t5@ Adding screws (current) t4: Adding drill t3: Adding saw