Mercurial > evolve
comparison tests/test-topic-stack.t @ 6064:28a77df6e41f mercurial-5.7
test-compat: merge mercurial-5.8 into mercurial-5.7
# no-check-commit
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Tue, 12 Oct 2021 11:15:44 +0300 |
| parents | 2800aa3c3dbf |
| children | c0921b5277a0 caf302fb8f4d |
comparison
equal
deleted
inserted
replaced
| 5996:91c3a9dd5f77 | 6064:28a77df6e41f |
|---|---|
| 623 | | 623 | |
| 624 o 1 default {} public c_b | 624 o 1 default {} public c_b |
| 625 | | 625 | |
| 626 o 0 default {} public c_a | 626 o 0 default {} public c_a |
| 627 | 627 |
| 628 $ hg log -r 'desc("c_D")' -T '{rev}: {join(extras, " ")}\n' | |
| 629 17: _rewrite_noise=[0-9a-f]+ amend_source=[0-9a-f]+ branch=default topic=foobar (re) | |
| 630 | |
| 628 XXX: The following should show single heads | 631 XXX: The following should show single heads |
| 629 XXX: The behind count is weird, because the topic are interleaved. | 632 XXX: The behind count is weird, because the topic are interleaved. |
| 630 | 633 |
| 631 $ hg stack | 634 $ hg stack |
| 632 ### topic: foobar | 635 ### topic: foobar |
| 637 s0^ c_c (base) | 640 s0^ c_c (base) |
| 638 | 641 |
| 639 $ hg stack -v | 642 $ hg stack -v |
| 640 ### topic: foobar | 643 ### topic: foobar |
| 641 ### target: default (branch), 3 behind | 644 ### target: default (branch), 3 behind |
| 642 s2(ea0f882ce093)@ c_e (current) | 645 s2(5985c9f0df93)@ c_e (current) |
| 643 ^ c_h | 646 ^ c_h |
| 644 s1(d2f548af67ab): c_D | 647 s1(cab9d344b7b5): c_D |
| 645 s0(8522f9e3fee9)^ c_c (base) | 648 s0(8522f9e3fee9)^ c_c (base) |
| 646 | 649 |
| 647 $ hg stack --debug | 650 $ hg stack --debug |
| 648 ### topic: foobar | 651 ### topic: foobar |
| 649 ### target: default (branch), 3 behind | 652 ### target: default (branch), 3 behind |
| 650 s2(ea0f882ce093a2ad63db49083c5cb98a24a9470e)@ c_e (current) | 653 s2(5985c9f0df9331630a4f003f01d320303b8dcae1)@ c_e (current) |
| 651 ^ c_h | 654 ^ c_h |
| 652 s1(d2f548af67ab55b08452a3e00a539319490fcd5b): c_D | 655 s1(cab9d344b7b582ae7c125f0eae77c18c771c508d): c_D |
| 653 s0(8522f9e3fee92d4ec4e688ac3fbd2ee0f8fd5036)^ c_c (base) | 656 s0(8522f9e3fee92d4ec4e688ac3fbd2ee0f8fd5036)^ c_c (base) |
| 654 | 657 |
| 655 $ hg stack foo | 658 $ hg stack foo |
| 656 ### topic: foo | 659 ### topic: foo |
| 657 ### target: default (branch), ambiguous rebase destination - topic 'foo' has 3 heads | 660 ### target: default (branch), ambiguous rebase destination - topic 'foo' has 3 heads |