Mercurial > evolve
comparison tests/test-topic-stack.t @ 3016:d12c82fd1143
tests: update test output with commit 4f969b9e0cf5 in core
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Mon, 25 Sep 2017 02:29:41 +0530 |
| parents | 945a0989e41b |
| children | d9e998120771 |
comparison
equal
deleted
inserted
replaced
| 3015:4b951a9a6895 | 3016:d12c82fd1143 |
|---|---|
| 326 ------------------------------------- | 326 ------------------------------------- |
| 327 | 327 |
| 328 Make things linear again | 328 Make things linear again |
| 329 | 329 |
| 330 $ hg rebase -s 'desc(c_e)' -d 'desc(c_d) - obsolete()' | 330 $ hg rebase -s 'desc(c_e)' -d 'desc(c_d) - obsolete()' |
| 331 rebasing 4:0f9ac936c87d "c_e" | 331 rebasing 4:0f9ac936c87d "c_e" (foo) |
| 332 rebasing 5:6559e6d93aea "c_f" | 332 rebasing 5:6559e6d93aea "c_f" (foo) |
| 333 $ hg log -G | 333 $ hg log -G |
| 334 o 8 default {foo} draft c_f | 334 o 8 default {foo} draft c_f |
| 335 | | 335 | |
| 336 o 7 default {foo} draft c_e | 336 o 7 default {foo} draft c_e |
| 337 | | 337 | |
| 395 $ hg up 'desc(c_d)' | 395 $ hg up 'desc(c_d)' |
| 396 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | 396 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
| 397 $ echo ccc > ddd | 397 $ echo ccc > ddd |
| 398 $ hg commit --amend -m 'c_D' | 398 $ hg commit --amend -m 'c_D' |
| 399 $ hg rebase -d . -s 'desc(c_g)' | 399 $ hg rebase -d . -s 'desc(c_g)' |
| 400 rebasing 9:81264ae8a36a "c_g" | 400 rebasing 9:81264ae8a36a "c_g" (foo) |
| 401 rebasing 10:fde5f5941642 "c_h" | 401 rebasing 10:fde5f5941642 "c_h" (foo) |
| 402 $ hg log -G | 402 $ hg log -G |
| 403 o 13 default {foo} draft c_h | 403 o 13 default {foo} draft c_h |
| 404 | | 404 | |
| 405 o 12 default {foo} draft c_g | 405 o 12 default {foo} draft c_g |
| 406 | | 406 | |
| 461 | | 461 | |
| 462 o 0 default {} public c_a | 462 o 0 default {} public c_a |
| 463 | 463 |
| 464 Converting into a linear chain | 464 Converting into a linear chain |
| 465 $ hg rebase -s 'desc("c_e") - obsolete()' -d 'desc("c_h") - obsolete()' | 465 $ hg rebase -s 'desc("c_e") - obsolete()' -d 'desc("c_h") - obsolete()' |
| 466 rebasing 7:215bc359096a "c_e" | 466 rebasing 7:215bc359096a "c_e" (foo) |
| 467 rebasing 8:ec9267b3f33f "c_f" | 467 rebasing 8:ec9267b3f33f "c_f" (foo) |
| 468 | 468 |
| 469 $ hg log -G | 469 $ hg log -G |
| 470 o 15 default {foo} draft c_f | 470 o 15 default {foo} draft c_f |
| 471 | | 471 | |
| 472 o 14 default {foo} draft c_e | 472 o 14 default {foo} draft c_e |
| 507 o 1 default {} public c_b | 507 o 1 default {} public c_b |
| 508 | | 508 | |
| 509 o 0 default {} public c_a | 509 o 0 default {} public c_a |
| 510 | 510 |
| 511 $ hg rebase -s 'desc("c_f") - obsolete()' -d 'desc("c_e") - obsolete()' | 511 $ hg rebase -s 'desc("c_f") - obsolete()' -d 'desc("c_e") - obsolete()' |
| 512 rebasing 15:77082e55de88 "c_f" | 512 rebasing 15:77082e55de88 "c_f" (foo) |
| 513 switching to topic foo | 513 switching to topic foo |
| 514 switching to topic foobar | 514 switching to topic foobar |
| 515 $ hg rebase -s 'desc("c_g") - obsolete()' -d 'desc("c_D") - obsolete()' | 515 $ hg rebase -s 'desc("c_g") - obsolete()' -d 'desc("c_D") - obsolete()' |
| 516 rebasing 12:0c3e8aed985d "c_g" | 516 rebasing 12:0c3e8aed985d "c_g" (foo) |
| 517 switching to topic foo | 517 switching to topic foo |
| 518 rebasing 13:b9e4f3709bc5 "c_h" | 518 rebasing 13:b9e4f3709bc5 "c_h" (foo) |
| 519 rebasing 16:4bc813530301 "c_e" | 519 rebasing 16:4bc813530301 "c_e" (foobar) |
| 520 switching to topic foobar | 520 switching to topic foobar |
| 521 rebasing 18:4406ea4be852 "c_f" (tip) | 521 rebasing 18:4406ea4be852 "c_f" (tip foo) |
| 522 switching to topic foo | 522 switching to topic foo |
| 523 switching to topic foobar | 523 switching to topic foobar |
| 524 $ hg up | 524 $ hg up |
| 525 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | 525 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 526 $ hg log --graph | 526 $ hg log --graph |