Mercurial > evolve
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 4064:a2c0133006c6 | 4065:fbc51e98cf13 |
|---|---|
| 38 | 38 |
| 39 The 'stack' will show you information about the stack of commit belonging to | 39 The 'stack' will show you information about the stack of commit belonging to |
| 40 your current topic. | 40 your current topic. |
| 41 | 41 |
| 42 Topic is offering you aliases reference to changeset in your current topic | 42 Topic is offering you aliases reference to changeset in your current topic |
| 43 stack as 't#'. For example, 't1' refers to the root of your stack, 't2' to the | 43 stack as 't#'. For example, 's1' refers to the root of your stack, 's2' to the |
| 44 second commits, etc. The 'hg stack' command show these number. | 44 second commits, etc. The 'hg stack' command show these number. 's0' can be |
| 45 used to refer to the parent of the topic root. Updating using 'hg up s0' will | |
| 46 keep the topic active. | |
| 45 | 47 |
| 46 Push behavior will change a bit with topic. When pushing to a publishing | 48 Push behavior will change a bit with topic. When pushing to a publishing |
| 47 repository the changesets will turn public and the topic data on them will | 49 repository the changesets will turn public and the topic data on them will |
| 48 fade away. The logic regarding pushing new heads will behave has before, | 50 fade away. The logic regarding pushing new heads will behave has before, |
| 49 ignore any topic related data. When pushing to a non-publishing repository | 51 ignore any topic related data. When pushing to a non-publishing repository |
| 789 | | 791 | |
| 790 | 792 |
| 791 $ hg topics | 793 $ hg topics |
| 792 fran (1 changesets) | 794 fran (1 changesets) |
| 793 | 795 |
| 794 Testing for updating to t0 | 796 Testing for updating to s0 |
| 795 ========================== | 797 ========================== |
| 796 | 798 |
| 797 $ hg up fran | 799 $ hg up fran |
| 798 switching to topic fran | 800 switching to topic fran |
| 799 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 801 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 801 ### topic: fran | 803 ### topic: fran |
| 802 ### target: default (branch), ambiguous rebase destination - branch 'default' has 2 heads | 804 ### target: default (branch), ambiguous rebase destination - branch 'default' has 2 heads |
| 803 t1@ start on fran (current) | 805 t1@ start on fran (current) |
| 804 t0^ Add file delta (base) | 806 t0^ Add file delta (base) |
| 805 | 807 |
| 806 $ hg up t0 | 808 $ hg up s0 |
| 807 preserving the current topic 'fran' | 809 preserving the current topic 'fran' |
| 808 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 810 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 809 | 811 |
| 810 $ hg topic | 812 $ hg topic |
| 811 * fran (1 changesets) | 813 * fran (1 changesets) |