Mercurial > evolve
comparison tests/test-evolve-topic.t @ 4161:3c28f8a3a5a5
prev: also use stack shortcut in output when possible
This mirror what `hg evolve` is doing since cc3a0b13ae57.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 12 Oct 2018 14:40:03 +0200 |
| parents | 44133463372f |
| children | e268f7fd7839 0e59b03afe0a |
comparison
equal
deleted
inserted
replaced
| 4160:44133463372f | 4161:3c28f8a3a5a5 |
|---|---|
| 205 $ hg up foo | 205 $ hg up foo |
| 206 switching to topic foo | 206 switching to topic foo |
| 207 0 files updated, 0 files merged, 4 files removed, 0 files unresolved | 207 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
| 208 $ hg prev | 208 $ hg prev |
| 209 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 209 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 210 [12] add eee | 210 [s3] add eee |
| 211 $ hg next | 211 $ hg next |
| 212 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 212 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 213 [s4] add fff | 213 [s4] add fff |
| 214 $ hg next | 214 $ hg next |
| 215 no children on topic "foo" | 215 no children on topic "foo" |
| 220 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 220 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 221 [14] add ggg | 221 [14] add ggg |
| 222 $ hg prev | 222 $ hg prev |
| 223 preserving the current topic 'bar' | 223 preserving the current topic 'bar' |
| 224 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 224 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 225 [13] add fff | 225 [s4] add fff |
| 226 $ hg prev | 226 $ hg prev |
| 227 no parent in topic "bar" | 227 no parent in topic "bar" |
| 228 (do you want --no-topic) | 228 (do you want --no-topic) |
| 229 [1] | 229 [1] |
| 230 $ hg prev --no-topic | 230 $ hg prev --no-topic |
| 272 s1: add fff | 272 s1: add fff |
| 273 s0^ add eee (base) | 273 s0^ add eee (base) |
| 274 | 274 |
| 275 $ hg prev | 275 $ hg prev |
| 276 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 276 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 277 [18] add fff | 277 [s1] add fff |
| 278 | 278 |
| 279 Testing issue 5708 when we are on obsolete changeset and there is active topic | 279 Testing issue 5708 when we are on obsolete changeset and there is active topic |
| 280 ------------------------------------------------------------------------------ | 280 ------------------------------------------------------------------------------ |
| 281 | 281 |
| 282 $ hg log --graph | 282 $ hg log --graph |
| 330 | | 330 | |
| 331 ~ | 331 ~ |
| 332 | 332 |
| 333 $ hg prev | 333 $ hg prev |
| 334 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 334 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 335 [14] add ggg | 335 [s2] add ggg |
| 336 | 336 |
| 337 When the current topic and successors topic are same, but obsolete cset has | 337 When the current topic and successors topic are same, but obsolete cset has |
| 338 different topic | 338 different topic |
| 339 | 339 |
| 340 $ hg rebase -s d2dc89c57700 -d d834582d9ee3 --config extensions.rebase= | 340 $ hg rebase -s d2dc89c57700 -d d834582d9ee3 --config extensions.rebase= |
| 378 $ hg up 070c5573d8f9 | 378 $ hg up 070c5573d8f9 |
| 379 switching to topic foo | 379 switching to topic foo |
| 380 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 380 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 381 $ hg prev | 381 $ hg prev |
| 382 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 382 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 383 [12] add eee | 383 [s3] add eee |