Mercurial > evolve
comparison tests/test-topic.t @ 4067:fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
If we want people to use it, we should display it.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 03 Sep 2018 17:07:36 +0200 |
| parents | fbc51e98cf13 |
| children | a93b74f745a6 |
comparison
equal
deleted
inserted
replaced
| 4066:1aa5f851d2c0 | 4067:fb4801478d5d |
|---|---|
| 271 * narf (on branch: default, 0 changesets) | 271 * narf (on branch: default, 0 changesets) |
| 272 $ hg stack | 272 $ hg stack |
| 273 ### topic: narf | 273 ### topic: narf |
| 274 ### target: default (branch) | 274 ### target: default (branch) |
| 275 (stack is empty) | 275 (stack is empty) |
| 276 t0^ Add file delta (base current) | 276 s0^ Add file delta (base current) |
| 277 | 277 |
| 278 Add commits to topic | 278 Add commits to topic |
| 279 | 279 |
| 280 $ echo topic work >> alpha | 280 $ echo topic work >> alpha |
| 281 $ hg ci -m 'start on narf' | 281 $ hg ci -m 'start on narf' |
| 800 switching to topic fran | 800 switching to topic fran |
| 801 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 |
| 802 $ hg stack | 802 $ hg stack |
| 803 ### topic: fran | 803 ### topic: fran |
| 804 ### target: default (branch), ambiguous rebase destination - branch 'default' has 2 heads | 804 ### target: default (branch), ambiguous rebase destination - branch 'default' has 2 heads |
| 805 t1@ start on fran (current) | 805 s1@ start on fran (current) |
| 806 t0^ Add file delta (base) | 806 s0^ Add file delta (base) |
| 807 | 807 |
| 808 $ hg up s0 | 808 $ hg up s0 |
| 809 preserving the current topic 'fran' | 809 preserving the current topic 'fran' |
| 810 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 |
| 811 | 811 |
| 812 $ hg topic | 812 $ hg topic |
| 813 * fran (1 changesets) | 813 * fran (1 changesets) |
| 814 $ hg stack | 814 $ hg stack |
| 815 ### topic: fran | 815 ### topic: fran |
| 816 ### target: default (branch), ambiguous rebase destination - branch 'default' has 2 heads | 816 ### target: default (branch), ambiguous rebase destination - branch 'default' has 2 heads |
| 817 t1: start on fran | 817 s1: start on fran |
| 818 t0^ Add file delta (base current) | 818 s0^ Add file delta (base current) |
| 819 | 819 |
| 820 $ hg topics --age | 820 $ hg topics --age |
| 821 * fran (1970-01-01 by test) | 821 * fran (1970-01-01 by test) |
| 822 | 822 |
| 823 $ cd .. | 823 $ cd .. |