Mercurial > evolve
comparison tests/test-topic-stack-data.t @ 3420:b21a3753255f mercurial-4.1
test-compat: merge mercurial-4.2 into mercurial-4.1
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 16 Jan 2018 04:41:48 +0100 |
| parents | 85cdce113c2c |
| children | 98941c28f3e2 |
comparison
equal
deleted
inserted
replaced
| 3382:f14ad1e83896 | 3420:b21a3753255f |
|---|---|
| 42 $ mkcommit lake_b | 42 $ mkcommit lake_b |
| 43 $ hg up 'desc(lake_a)' | 43 $ hg up 'desc(lake_a)' |
| 44 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 44 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 45 $ mkcommit lake_c | 45 $ mkcommit lake_c |
| 46 created new head | 46 created new head |
| 47 (consider using topic for lightweight branches. See 'hg help topic') | |
| 47 | 48 |
| 48 | 49 |
| 49 Add some topics | 50 Add some topics |
| 50 --------------- | 51 --------------- |
| 51 | 52 |
| 112 update: 2 new changesets (update) | 113 update: 2 new changesets (update) |
| 113 phases: 22 draft | 114 phases: 22 draft |
| 114 unstable: 3 changesets | 115 unstable: 3 changesets |
| 115 topic: foo | 116 topic: foo |
| 116 $ hg log --graph -T '{desc} ({branch}) [{topic}]' | 117 $ hg log --graph -T '{desc} ({branch}) [{topic}]' |
| 117 @ add foo_b (lake) [] | 118 @ add foo_b (lake) [foo] |
| 118 | | 119 | |
| 119 o add foo_a (lake) [] | 120 o add foo_a (lake) [foo] |
| 120 | | 121 | |
| 121 | o bar1_d (default) [] | 122 | o bar1_d (default) [bar] |
| 122 | | | 123 | | |
| 123 | | o add bar_e (default) [] | 124 | | o add bar_e (default) [bar] |
| 124 | | | | 125 | | | |
| 125 | | x add bar_d (default) [] | 126 | | x add bar_d (default) [bar] |
| 126 | |/ | 127 | |/ |
| 127 | | o add bar_c (default) [] | 128 | | o add bar_c (default) [bar] |
| 128 | |/ | 129 | |/ |
| 129 | o add bar_b (default) [] | 130 | o add bar_b (default) [bar] |
| 130 | | | 131 | | |
| 131 | o add bar_a (default) [] | 132 | o add bar_a (default) [bar] |
| 132 | | | 133 | | |
| 133 | | o fuz1_a (default) [] | 134 | | o fuz1_a (default) [fuz] |
| 134 | | | | 135 | | | |
| 135 | | | o add fuz_c (default) [] | 136 | | | o add fuz_c (default) [fuz] |
| 136 | | | | | 137 | | | | |
| 137 | | | o add fuz_b (default) [] | 138 | | | o add fuz_b (default) [fuz] |
| 138 | | | | | 139 | | | | |
| 139 | | | x add fuz_a (default) [] | 140 | | | x add fuz_a (default) [fuz] |
| 140 | | |/ | 141 | | |/ |
| 141 | | | o add baz_b (default) [] | 142 | | | o add baz_b (default) [baz] |
| 142 | | | | | 143 | | | | |
| 143 | | | o add baz_a (default) [] | 144 | | | o add baz_a (default) [baz] |
| 144 | | | | | 145 | | | | |
| 145 +-------o add lake_c (lake) [] | 146 +-------o add lake_c (lake) [] |
| 146 | | | | | 147 | | | | |
| 147 +-------o add lake_b (lake) [] | 148 +-------o add lake_b (lake) [] |
| 148 | | | | | 149 | | | | |
| 171 fuz (3 changesets, 2 troubled) | 172 fuz (3 changesets, 2 troubled) |
| 172 | 173 |
| 173 quiet version | 174 quiet version |
| 174 | 175 |
| 175 $ hg topic --quiet | 176 $ hg topic --quiet |
| 176 bar (5 changesets, 1 troubled, 2 heads) | 177 bar |
| 177 baz (2 changesets) | 178 baz |
| 178 foo (2 changesets) | 179 foo |
| 179 fuz (3 changesets, 2 troubled) | 180 fuz |
| 180 | 181 |
| 181 verbose | 182 verbose |
| 182 | 183 |
| 183 $ hg topic --verbose | 184 $ hg topic --verbose |
| 184 bar (on branch: default, 5 changesets, 1 troubled, 2 heads) | 185 bar (on branch: default, 5 changesets, 1 troubled, 2 heads) |