Mercurial > evolve
comparison tests/test-topic.t @ 3013:945a0989e41b
packaging: merge stable back into default
6.7.0 has been released.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 27 Sep 2017 16:26:30 +0200 |
| parents | bd7e8be29542 |
| children | 5f4c42d4f2e8 |
comparison
equal
deleted
inserted
replaced
| 3012:081070828703 | 3013:945a0989e41b |
|---|---|
| 1 $ . "$TESTDIR/testlib/topic_setup.sh" | 1 $ . "$TESTDIR/testlib/topic_setup.sh" |
| 2 | 2 |
| 3 $ hg init pinky --traceback | 3 $ hg init pinky |
| 4 $ cd pinky | 4 $ cd pinky |
| 5 $ cat <<EOF >> .hg/hgrc | 5 $ cat <<EOF >> .hg/hgrc |
| 6 > [phases] | 6 > [phases] |
| 7 > publish=false | 7 > publish=false |
| 8 > EOF | 8 > EOF |
| 652 | summary: start on fran | 652 | summary: start on fran |
| 653 | | 653 | |
| 654 | @ changeset: 10:4073470c35e1 | 654 | @ changeset: 10:4073470c35e1 |
| 655 | | user: test | 655 | | user: test |
| 656 | | date: Thu Jan 01 00:00:00 1970 +0000 | 656 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 657 | | trouble: unstable | 657 | | instability: orphan |
| 658 | | summary: fran? | 658 | | summary: fran? |
| 659 | | | 659 | | |
| 660 | 660 |
| 661 Normally you'd do this with evolve, but we'll use rebase to avoid | 661 Normally you'd do this with evolve, but we'll use rebase to avoid |
| 662 bonus deps in the testsuite. | 662 bonus deps in the testsuite. |
| 677 changed topic on 1 changes | 677 changed topic on 1 changes |
| 678 $ hg log -r . | 678 $ hg log -r . |
| 679 changeset: 12:18b70b8de1f0 | 679 changeset: 12:18b70b8de1f0 |
| 680 user: test | 680 user: test |
| 681 date: Thu Jan 01 00:00:00 1970 +0000 | 681 date: Thu Jan 01 00:00:00 1970 +0000 |
| 682 trouble: unstable | 682 instability: orphan |
| 683 summary: fran? | 683 summary: fran? |
| 684 | 684 |
| 685 $ hg sum | 685 $ hg sum |
| 686 parent: 12:18b70b8de1f0 (unstable) | 686 parent: 12:18b70b8de1f0 (orphan) |
| 687 fran? | 687 fran? |
| 688 branch: default | 688 branch: default |
| 689 commit: (clean) | 689 commit: (clean) |
| 690 update: 5 new changesets, 2 branch heads (merge) | 690 update: 5 new changesets, 2 branch heads (merge) |
| 691 phases: 3 draft | 691 phases: 3 draft |
| 692 unstable: 1 changesets | 692 orphan: 1 changesets |
| 693 $ hg topic | 693 $ hg topic |
| 694 wat | 694 wat |
| 695 $ hg log -Gr 'draft() and not obsolete()' | 695 $ hg log -Gr 'draft() and not obsolete()' |
| 696 o changeset: 13:686a642006db | 696 o changeset: 13:686a642006db |
| 697 | tag: tip | 697 | tag: tip |
| 702 | summary: start on fran | 702 | summary: start on fran |
| 703 | | 703 | |
| 704 | @ changeset: 12:18b70b8de1f0 | 704 | @ changeset: 12:18b70b8de1f0 |
| 705 | | user: test | 705 | | user: test |
| 706 | | date: Thu Jan 01 00:00:00 1970 +0000 | 706 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 707 | | trouble: unstable | 707 | | instability: orphan |
| 708 | | summary: fran? | 708 | | summary: fran? |
| 709 | | | 709 | | |
| 710 | 710 |
| 711 Normally you'd do this with evolve, but we'll use rebase to avoid | 711 Normally you'd do this with evolve, but we'll use rebase to avoid |
| 712 bonus deps in the testsuite. | 712 bonus deps in the testsuite. |
| 739 $ hg topic watwat | 739 $ hg topic watwat |
| 740 marked working directory as topic: watwat | 740 marked working directory as topic: watwat |
| 741 $ hg ci --amend | 741 $ hg ci --amend |
| 742 active topic 'watwat' grew its first changeset | 742 active topic 'watwat' grew its first changeset |
| 743 $ hg log -Gr 'draft()' | 743 $ hg log -Gr 'draft()' |
| 744 @ changeset: 16:6c40a4c21bbe | 744 @ changeset: 15:6c40a4c21bbe |
| 745 | tag: tip | 745 | tag: tip |
| 746 | topic: watwat | 746 | topic: watwat |
| 747 | parent: 13:686a642006db | 747 | parent: 13:686a642006db |
| 748 | user: test | 748 | user: test |
| 749 | date: Thu Jan 01 00:00:00 1970 +0000 | 749 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 760 Clear and amend: | 760 Clear and amend: |
| 761 | 761 |
| 762 $ hg topic --clear | 762 $ hg topic --clear |
| 763 $ hg ci --amend | 763 $ hg ci --amend |
| 764 $ hg log -r . | 764 $ hg log -r . |
| 765 changeset: 18:0f9cd5070654 | 765 changeset: 16:0f9cd5070654 |
| 766 tag: tip | 766 tag: tip |
| 767 parent: 13:686a642006db | 767 parent: 13:686a642006db |
| 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 summary: fran? | 770 summary: fran? |
| 773 $ hg topic --rev . watwat | 773 $ hg topic --rev . watwat |
| 774 switching to topic watwat | 774 switching to topic watwat |
| 775 changed topic on 1 changes | 775 changed topic on 1 changes |
| 776 | 776 |
| 777 Testing issue5441 | 777 Testing issue5441 |
| 778 $ hg co 19 | 778 $ hg co 17 |
| 779 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 779 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 780 $ hg log -Gr 'draft()' | 780 $ hg log -Gr 'draft()' |
| 781 @ changeset: 19:980a0f608481 | 781 @ changeset: 17:980a0f608481 |
| 782 | tag: tip | 782 | tag: tip |
| 783 | topic: watwat | 783 | topic: watwat |
| 784 | parent: 13:686a642006db | 784 | parent: 13:686a642006db |
| 785 | user: test | 785 | user: test |
| 786 | date: Thu Jan 01 00:00:00 1970 +0000 | 786 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 795 | | 795 | |
| 796 | 796 |
| 797 Using the current flag | 797 Using the current flag |
| 798 | 798 |
| 799 $ hg topic changewat | 799 $ hg topic changewat |
| 800 $ hg topics --rev '13::19' --current | 800 $ hg topics --rev '13::17' --current |
| 801 active topic 'changewat' grew its 2 first changesets | 801 active topic 'changewat' grew its 2 first changesets |
| 802 changed topic on 2 changes | 802 changed topic on 2 changes |
| 803 | 803 |
| 804 $ hg log -Gr 'draft()' | 804 $ hg log -Gr 'draft()' |
| 805 @ changeset: 21:56c83be6105f | 805 @ changeset: 19:56c83be6105f |
| 806 | tag: tip | 806 | tag: tip |
| 807 | topic: changewat | 807 | topic: changewat |
| 808 | user: test | 808 | user: test |
| 809 | date: Thu Jan 01 00:00:00 1970 +0000 | 809 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 810 | summary: fran? | 810 | summary: fran? |
| 811 | | 811 | |
| 812 o changeset: 20:ceba5be9d56f | 812 o changeset: 18:ceba5be9d56f |
| 813 | topic: changewat | 813 | topic: changewat |
| 814 | parent: 3:a53952faf762 | 814 | parent: 3:a53952faf762 |
| 815 | user: test | 815 | user: test |
| 816 | date: Thu Jan 01 00:00:00 1970 +0000 | 816 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 817 | summary: start on fran | 817 | summary: start on fran |
| 825 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 825 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 826 $ echo gamma >> gamma | 826 $ echo gamma >> gamma |
| 827 $ hg ci -m gamma | 827 $ hg ci -m gamma |
| 828 | 828 |
| 829 $ hg log -Gr 'draft()' | 829 $ hg log -Gr 'draft()' |
| 830 @ changeset: 22:0d3d805542b4 | 830 @ changeset: 20:0d3d805542b4 |
| 831 | tag: tip | 831 | tag: tip |
| 832 | topic: changewat | 832 | topic: changewat |
| 833 | parent: 20:ceba5be9d56f | 833 | parent: 18:ceba5be9d56f |
| 834 | user: test | 834 | user: test |
| 835 | date: Thu Jan 01 00:00:00 1970 +0000 | 835 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 836 | summary: gamma | 836 | summary: gamma |
| 837 | | 837 | |
| 838 | o changeset: 21:56c83be6105f | 838 | o changeset: 19:56c83be6105f |
| 839 |/ topic: changewat | 839 |/ topic: changewat |
| 840 | user: test | 840 | user: test |
| 841 | date: Thu Jan 01 00:00:00 1970 +0000 | 841 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 842 | summary: fran? | 842 | summary: fran? |
| 843 | | 843 | |
| 844 o changeset: 20:ceba5be9d56f | 844 o changeset: 18:ceba5be9d56f |
| 845 | topic: changewat | 845 | topic: changewat |
| 846 | parent: 3:a53952faf762 | 846 | parent: 3:a53952faf762 |
| 847 | user: test | 847 | user: test |
| 848 | date: Thu Jan 01 00:00:00 1970 +0000 | 848 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 849 | summary: start on fran | 849 | summary: start on fran |
| 853 switching to topic changewut | 853 switching to topic changewut |
| 854 active topic 'changewat' is now empty | 854 active topic 'changewat' is now empty |
| 855 changed topic on 3 changes | 855 changed topic on 3 changes |
| 856 | 856 |
| 857 $ hg log -Gr 'draft()' | 857 $ hg log -Gr 'draft()' |
| 858 @ changeset: 25:729ed5717393 | 858 @ changeset: 23:729ed5717393 |
| 859 | tag: tip | 859 | tag: tip |
| 860 | topic: changewut | 860 | topic: changewut |
| 861 | parent: 23:62e49f09f883 | 861 | parent: 21:62e49f09f883 |
| 862 | user: test | 862 | user: test |
| 863 | date: Thu Jan 01 00:00:00 1970 +0000 | 863 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 864 | summary: gamma | 864 | summary: gamma |
| 865 | | 865 | |
| 866 | o changeset: 24:369c6e2e5474 | 866 | o changeset: 22:369c6e2e5474 |
| 867 |/ topic: changewut | 867 |/ topic: changewut |
| 868 | user: test | 868 | user: test |
| 869 | date: Thu Jan 01 00:00:00 1970 +0000 | 869 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 870 | summary: fran? | 870 | summary: fran? |
| 871 | | 871 | |
| 872 o changeset: 23:62e49f09f883 | 872 o changeset: 21:62e49f09f883 |
| 873 | topic: changewut | 873 | topic: changewut |
| 874 | parent: 3:a53952faf762 | 874 | parent: 3:a53952faf762 |
| 875 | user: test | 875 | user: test |
| 876 | date: Thu Jan 01 00:00:00 1970 +0000 | 876 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 877 | summary: start on fran | 877 | summary: start on fran |