Mercurial > evolve
diff tests/test-topic.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 | 6774820c8a2e |
children | fb4801478d5d |
line wrap: on
line diff
--- a/tests/test-topic.t Sat Sep 01 14:00:41 2018 +0200 +++ b/tests/test-topic.t Mon Sep 03 16:29:02 2018 +0200 @@ -40,8 +40,10 @@ your current topic. Topic is offering you aliases reference to changeset in your current topic - stack as 't#'. For example, 't1' refers to the root of your stack, 't2' to the - second commits, etc. The 'hg stack' command show these number. + stack as 't#'. For example, 's1' refers to the root of your stack, 's2' to the + second commits, etc. The 'hg stack' command show these number. 's0' can be + used to refer to the parent of the topic root. Updating using 'hg up s0' will + keep the topic active. Push behavior will change a bit with topic. When pushing to a publishing repository the changesets will turn public and the topic data on them will @@ -791,7 +793,7 @@ $ hg topics fran (1 changesets) -Testing for updating to t0 +Testing for updating to s0 ========================== $ hg up fran @@ -803,7 +805,7 @@ t1@ start on fran (current) t0^ Add file delta (base) - $ hg up t0 + $ hg up s0 preserving the current topic 'fran' 1 files updated, 0 files merged, 0 files removed, 0 files unresolved