Mercurial > evolve
comparison tests/test-topic-stack.t @ 5830:67fc03f42d92 mercurial-5.0
test-compat: merge mercurial-5.1 into mercurial-5.0
# no-check-commit
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 11 Mar 2021 14:22:45 +0800 |
| parents | c2c85576ddfb 664f62e57231 |
| children | 1f301a3062f5 e82ad19eb3cc |
comparison
equal
deleted
inserted
replaced
| 5763:c2c85576ddfb | 5830:67fc03f42d92 |
|---|---|
| 64 s1: c_a | 64 s1: c_a |
| 65 $ hg phase --public 'topic("other")' | 65 $ hg phase --public 'topic("other")' |
| 66 active topic 'other' is now empty | 66 active topic 'other' is now empty |
| 67 (use 'hg topic --clear' to clear it if needed) | 67 (use 'hg topic --clear' to clear it if needed) |
| 68 | 68 |
| 69 After changing the phase of all the changesets in "other" to public, the topic should still be active, but is empty. We should be better at informating the user about it and displaying good data in this case. | 69 After changing the phase of all the changesets in "other" to public, the topic should still be active, but is empty. We should be better at informing the user about it and displaying good data in this case. |
| 70 | 70 |
| 71 $ hg topic | 71 $ hg topic |
| 72 foo (4 changesets) | 72 foo (4 changesets) |
| 73 * other (0 changesets) | 73 * other (0 changesets) |
| 74 $ hg stack | 74 $ hg stack |
| 459 s3: c_e | 459 s3: c_e |
| 460 s2: c_d | 460 s2: c_d |
| 461 s1: c_c | 461 s1: c_c |
| 462 s0^ c_b (base) | 462 s0^ c_b (base) |
| 463 | 463 |
| 464 Case with multiple heads on the topic with unstability involved | 464 Case with multiple heads on the topic with instability involved |
| 465 --------------------------------------------------------------- | 465 --------------------------------------------------------------- |
| 466 | 466 |
| 467 We amend the message to make sure the display base pick the right changeset | 467 We amend the message to make sure the display base picks the right changeset |
| 468 | 468 |
| 469 $ hg up 'desc(c_d)' | 469 $ hg up 'desc(c_d)' |
| 470 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | 470 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
| 471 $ echo ccc > ddd | 471 $ echo ccc > ddd |
| 472 $ hg commit --amend -m 'c_D' | 472 $ hg commit --amend -m 'c_D' |
| 749 s0^ c_F (base) | 749 s0^ c_F (base) |
| 750 | 750 |
| 751 Even with some obsolete and orphan changesets | 751 Even with some obsolete and orphan changesets |
| 752 | 752 |
| 753 (the ordering of each branch of "blue" change because their hash change. we | 753 (the ordering of each branch of "blue" change because their hash change. we |
| 754 should stabilize this eventuelly) | 754 should stabilize this eventually) |
| 755 | 755 |
| 756 $ hg up 'desc("c_B")' | 756 $ hg up 'desc("c_B")' |
| 757 switching to topic red | 757 switching to topic red |
| 758 0 files updated, 0 files merged, 6 files removed, 0 files unresolved | 758 0 files updated, 0 files merged, 6 files removed, 0 files unresolved |
| 759 $ hg commit --amend --user test2 | 759 $ hg commit --amend --user test2 |
| 1013 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | 1013 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
| 1014 +++ b/Z Thu Jan 01 00:00:00 1970 +0000 | 1014 +++ b/Z Thu Jan 01 00:00:00 1970 +0000 |
| 1015 @@ -0,0 +1,1 @@ | 1015 @@ -0,0 +1,1 @@ |
| 1016 +zzz | 1016 +zzz |
| 1017 | 1017 |
| 1018 Check that stack ouput still make sense | 1018 Check that stack output still makes sense |
| 1019 | 1019 |
| 1020 $ hg stack | 1020 $ hg stack |
| 1021 ### topic: blue | 1021 ### topic: blue |
| 1022 ### target: default (branch) | 1022 ### target: default (branch) |
| 1023 s4$ c_I (orphan) | 1023 s4$ c_I (orphan) |