Mercurial > evolve
diff tests/test-topic-tutorial.t @ 4065:fbc51e98cf13
alias: allow reference through 's#'
We keep the 't#' option, but we hope to be able to deprecate it at some point.
We move to 's#' because it refers to `stack` a more generic concept. than topic.
In addition, this allows to phase out 'b#' that collide with normal hex-node.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Mon, 03 Sep 2018 16:29:02 +0200 |
parents | eb928f5728c4 |
children | fb4801478d5d |
line wrap: on
line diff
--- a/tests/test-topic-tutorial.t Sat Sep 01 14:00:41 2018 +0200 +++ b/tests/test-topic-tutorial.t Mon Sep 03 16:29:02 2018 +0200 @@ -1177,7 +1177,7 @@ 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 @@ -1207,7 +1207,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 @@ -1255,7 +1255,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" { @@ -1364,7 +1364,7 @@ t0^ 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 @@ -1397,7 +1397,7 @@ 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 @@ -1436,7 +1436,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" { @@ -1521,7 +1521,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 @@ -1771,7 +1771,7 @@ } #endif - $ hg up t4 + $ hg up s4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg rebase