Mercurial > evolve
comparison tests/test-evolve-content-divergent-stack.t @ 5811:4688b7eb7e40
evolve: preserve wdir when using --stop
After this change using hg evolve --stop update the working copy
parent back to where the working copy was before the hg evolve
operation (or the successors of that)
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Wed, 26 Aug 2020 23:27:17 +0530 |
| parents | 61d2f1cf90f0 |
| children | fd039a7f0c3c b68789e8c535 |
comparison
equal
deleted
inserted
replaced
| 5810:0a364a0aba27 | 5811:4688b7eb7e40 |
|---|---|
| 747 [240] | 747 [240] |
| 748 | 748 |
| 749 $ hg evolve --stop | 749 $ hg evolve --stop |
| 750 2 new orphan changesets | 750 2 new orphan changesets |
| 751 stopped the interrupted evolve | 751 stopped the interrupted evolve |
| 752 working directory is now at 2a955e808c53 | 752 working directory is now at 509103439e5e |
| 753 $ hg log -G | 753 $ hg log -G |
| 754 o changeset: 21:7e67dfb7ee31 | 754 o changeset: 21:7e67dfb7ee31 |
| 755 | tag: tip | 755 | tag: tip |
| 756 | parent: 9:2228e3b74514 | 756 | parent: 9:2228e3b74514 |
| 757 | user: test | 757 | user: test |
| 768 | | user: test | 768 | | user: test |
| 769 | | date: Thu Jan 01 00:00:00 1970 +0000 | 769 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 770 | | instability: orphan, content-divergent | 770 | | instability: orphan, content-divergent |
| 771 | | summary: added c | 771 | | summary: added c |
| 772 | | | 772 | | |
| 773 | * changeset: 17:509103439e5e | 773 | @ changeset: 17:509103439e5e |
| 774 | | parent: 5:8e222f257bbf | 774 | | parent: 5:8e222f257bbf |
| 775 | | user: test | 775 | | user: test |
| 776 | | date: Thu Jan 01 00:00:00 1970 +0000 | 776 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 777 | | instability: orphan, content-divergent | 777 | | instability: orphan, content-divergent |
| 778 | | summary: added b | 778 | | summary: added b |
| 787 | | | user: test | 787 | | | user: test |
| 788 | | | date: Thu Jan 01 00:00:00 1970 +0000 | 788 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 789 | | | instability: orphan, content-divergent | 789 | | | instability: orphan, content-divergent |
| 790 | | | summary: added c | 790 | | | summary: added c |
| 791 | | | | 791 | | | |
| 792 | | @ changeset: 14:2a955e808c53 | 792 | | * changeset: 14:2a955e808c53 |
| 793 | | | parent: 10:c04ff147ef79 | 793 | | | parent: 10:c04ff147ef79 |
| 794 | | | user: test | 794 | | | user: test |
| 795 | | | date: Thu Jan 01 00:00:00 1970 +0000 | 795 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 796 | | | instability: orphan, content-divergent | 796 | | | instability: orphan, content-divergent |
| 797 | | | summary: added b | 797 | | | summary: added b |
| 835 |/ rewritten(description, content) from c7586e2a9264 using amend by test (Thu Jan 01 00:00:00 1970 +0000) | 835 |/ rewritten(description, content) from c7586e2a9264 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
| 836 | | 836 | |
| 837 x c7586e2a9264 (1) added a | 837 x c7586e2a9264 (1) added a |
| 838 | 838 |
| 839 $ hg obslog -r 'desc("added b")' --all | 839 $ hg obslog -r 'desc("added b")' --all |
| 840 @ 2a955e808c53 (14) added b | 840 * 2a955e808c53 (14) added b |
| 841 | amended(content) from 6eb54b5af3fb using amend by test (Thu Jan 01 00:00:00 1970 +0000) | 841 | amended(content) from 6eb54b5af3fb using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
| 842 | | 842 | |
| 843 | * 509103439e5e (17) added b | 843 | @ 509103439e5e (17) added b |
| 844 | | amended(content) from d5f148423c16 using amend by test (Thu Jan 01 00:00:00 1970 +0000) | 844 | | amended(content) from d5f148423c16 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
| 845 | | | 845 | | |
| 846 x | 6eb54b5af3fb (11) added b | 846 x | 6eb54b5af3fb (11) added b |
| 847 | | rebased(parent) from b1661037fa25 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) | 847 | | rebased(parent) from b1661037fa25 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
| 848 | | | 848 | | |