Mercurial > evolve
comparison tests/test-topic-stack.t @ 6065:c0921b5277a0 mercurial-5.6
test-compat: merge mercurial-5.7 into mercurial-5.6
# no-check-commit
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Tue, 12 Oct 2021 11:32:36 +0300 |
| parents | fd039a7f0c3c 2800aa3c3dbf |
| children | d3453ef71ce8 1328195f76a9 |
comparison
equal
deleted
inserted
replaced
| 6064:28a77df6e41f | 6065:c0921b5277a0 |
|---|---|
| 377 4 default {foo} draft c_e | 377 4 default {foo} draft c_e |
| 378 5 default {foo} draft c_f | 378 5 default {foo} draft c_f |
| 379 | 379 |
| 380 $ hg log -r 'stack(foo)' | 380 $ hg log -r 'stack(foo)' |
| 381 hg: parse error: stack takes no arguments, it works on current topic | 381 hg: parse error: stack takes no arguments, it works on current topic |
| 382 [10] | 382 [255] |
| 383 | 383 |
| 384 $ hg log -r 'stack(foobar)' | 384 $ hg log -r 'stack(foobar)' |
| 385 hg: parse error: stack takes no arguments, it works on current topic | 385 hg: parse error: stack takes no arguments, it works on current topic |
| 386 [10] | 386 [255] |
| 387 | 387 |
| 388 Stack relation: | 388 Stack relation: |
| 389 | 389 |
| 390 $ hg log -r 'foo#stack' | 390 $ hg log -r 'foo#stack' |
| 391 2 default {foo} draft c_c | 391 2 default {foo} draft c_c |
| 408 ------------------------------------- | 408 ------------------------------------- |
| 409 | 409 |
| 410 Make things linear again | 410 Make things linear again |
| 411 | 411 |
| 412 $ hg rebase -s 'desc(c_e)' -d 'desc(c_d) - obsolete()' | 412 $ hg rebase -s 'desc(c_e)' -d 'desc(c_d) - obsolete()' |
| 413 rebasing 4:0f9ac936c87d foo "c_e" | 413 rebasing 4:0f9ac936c87d "c_e" (foo) |
| 414 rebasing 5:6559e6d93aea foo "c_f" | 414 rebasing 5:6559e6d93aea "c_f" (foo) |
| 415 $ hg log -G | 415 $ hg log -G |
| 416 o 8 default {foo} draft c_f | 416 o 8 default {foo} draft c_f |
| 417 | | 417 | |
| 418 o 7 default {foo} draft c_e | 418 o 7 default {foo} draft c_e |
| 419 | | 419 | |
| 478 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | 478 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
| 479 $ echo ccc > ddd | 479 $ echo ccc > ddd |
| 480 $ hg commit --amend -m 'c_D' | 480 $ hg commit --amend -m 'c_D' |
| 481 4 new orphan changesets | 481 4 new orphan changesets |
| 482 $ hg rebase -d . -s 'desc(c_g)' | 482 $ hg rebase -d . -s 'desc(c_g)' |
| 483 rebasing 9:81264ae8a36a foo "c_g" | 483 rebasing 9:81264ae8a36a "c_g" (foo) |
| 484 rebasing 10:fde5f5941642 foo "c_h" | 484 rebasing 10:fde5f5941642 "c_h" (foo) |
| 485 $ hg log -G | 485 $ hg log -G |
| 486 o 13 default {foo} draft c_h | 486 o 13 default {foo} draft c_h |
| 487 | | 487 | |
| 488 o 12 default {foo} draft c_g | 488 o 12 default {foo} draft c_g |
| 489 | | 489 | |
| 544 | | 544 | |
| 545 o 0 default {} public c_a | 545 o 0 default {} public c_a |
| 546 | 546 |
| 547 Converting into a linear chain | 547 Converting into a linear chain |
| 548 $ hg rebase -s 'desc("c_e") - obsolete()' -d 'desc("c_h") - obsolete()' | 548 $ hg rebase -s 'desc("c_e") - obsolete()' -d 'desc("c_h") - obsolete()' |
| 549 rebasing 7:215bc359096a foo "c_e" | 549 rebasing 7:215bc359096a "c_e" (foo) |
| 550 rebasing 8:ec9267b3f33f foo "c_f" | 550 rebasing 8:ec9267b3f33f "c_f" (foo) |
| 551 | 551 |
| 552 $ hg log -G | 552 $ hg log -G |
| 553 o 15 default {foo} draft c_f | 553 o 15 default {foo} draft c_f |
| 554 | | 554 | |
| 555 o 14 default {foo} draft c_e | 555 o 14 default {foo} draft c_e |
| 591 o 1 default {} public c_b | 591 o 1 default {} public c_b |
| 592 | | 592 | |
| 593 o 0 default {} public c_a | 593 o 0 default {} public c_a |
| 594 | 594 |
| 595 $ hg rebase -s 'desc("c_f") - obsolete()' -d 'desc("c_e") - obsolete()' | 595 $ hg rebase -s 'desc("c_f") - obsolete()' -d 'desc("c_e") - obsolete()' |
| 596 rebasing 15:77082e55de88 foo "c_f" | 596 rebasing 15:77082e55de88 "c_f" (foo) |
| 597 switching to topic foo | 597 switching to topic foo |
| 598 1 new orphan changesets | 598 1 new orphan changesets |
| 599 switching to topic foobar | 599 switching to topic foobar |
| 600 $ hg rebase -s 'desc("c_g") - obsolete()' -d 'desc("c_D") - obsolete()' | 600 $ hg rebase -s 'desc("c_g") - obsolete()' -d 'desc("c_D") - obsolete()' |
| 601 rebasing 12:0c3e8aed985d foo "c_g" | 601 rebasing 12:0c3e8aed985d "c_g" (foo) |
| 602 switching to topic foo | 602 switching to topic foo |
| 603 rebasing 13:b9e4f3709bc5 foo "c_h" | 603 rebasing 13:b9e4f3709bc5 "c_h" (foo) |
| 604 rebasing 16:4bc813530301 foobar "c_e" | 604 rebasing 16:4bc813530301 "c_e" (foobar) |
| 605 switching to topic foobar | 605 switching to topic foobar |
| 606 rebasing 18:4406ea4be852 tip foo "c_f" | 606 rebasing 18:4406ea4be852 "c_f" (tip foo) |
| 607 switching to topic foo | 607 switching to topic foo |
| 608 switching to topic foobar | 608 switching to topic foobar |
| 609 $ hg up | 609 $ hg up |
| 610 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | 610 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 611 $ hg log --graph | 611 $ hg log --graph |
| 903 -------------------------------- | 903 -------------------------------- |
| 904 | 904 |
| 905 get things linear again | 905 get things linear again |
| 906 | 906 |
| 907 $ hg rebase -r s1 -d default | 907 $ hg rebase -r s1 -d default |
| 908 rebasing 16:1d84ec948370 tip blue "c_D" | 908 rebasing 16:1d84ec948370 "c_D" (tip blue) |
| 909 switching to topic blue | 909 switching to topic blue |
| 910 $ hg rebase -r s2 -d s1 | 910 $ hg rebase -r s2 -d s1 |
| 911 rebasing 13:3ab2eedae500 blue "c_G" | 911 rebasing 13:3ab2eedae500 "c_G" (blue) |
| 912 $ hg rebase -r s3 -d s2 | 912 $ hg rebase -r s3 -d s2 |
| 913 rebasing 8:3bfe800e0486 blue "c_I" | 913 rebasing 8:3bfe800e0486 "c_I" (blue) |
| 914 $ hg stack | 914 $ hg stack |
| 915 ### topic: blue | 915 ### topic: blue |
| 916 ### target: default (branch) | 916 ### target: default (branch) |
| 917 s3: c_I | 917 s3: c_I |
| 918 s2: c_G | 918 s2: c_G |