equal
deleted
inserted
replaced
717 Amend a topic |
717 Amend a topic |
718 |
718 |
719 $ hg topic watwat |
719 $ hg topic watwat |
720 $ hg ci --amend |
720 $ hg ci --amend |
721 $ hg log -Gr 'draft()' |
721 $ hg log -Gr 'draft()' |
722 @ changeset: 16:6c40a4c21bbe |
722 @ changeset: 15:6c40a4c21bbe |
723 | tag: tip |
723 | tag: tip |
724 | topic: watwat |
724 | topic: watwat |
725 | parent: 13:686a642006db |
725 | parent: 13:686a642006db |
726 | user: test |
726 | user: test |
727 | date: Thu Jan 01 00:00:00 1970 +0000 |
727 | date: Thu Jan 01 00:00:00 1970 +0000 |
738 Clear and amend: |
738 Clear and amend: |
739 |
739 |
740 $ hg topic --clear |
740 $ hg topic --clear |
741 $ hg ci --amend |
741 $ hg ci --amend |
742 $ hg log -r . |
742 $ hg log -r . |
743 changeset: 18:0f9cd5070654 |
743 changeset: 16:0f9cd5070654 |
744 tag: tip |
744 tag: tip |
745 parent: 13:686a642006db |
745 parent: 13:686a642006db |
746 user: test |
746 user: test |
747 date: Thu Jan 01 00:00:00 1970 +0000 |
747 date: Thu Jan 01 00:00:00 1970 +0000 |
748 summary: fran? |
748 summary: fran? |
751 $ hg topic --rev . watwat |
751 $ hg topic --rev . watwat |
752 switching to topic watwat |
752 switching to topic watwat |
753 changed topic on 1 changes |
753 changed topic on 1 changes |
754 |
754 |
755 Testing issue5441 |
755 Testing issue5441 |
756 $ hg co 19 |
756 $ hg co 17 |
757 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
757 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
758 $ hg log -Gr 'draft()' |
758 $ hg log -Gr 'draft()' |
759 @ changeset: 19:980a0f608481 |
759 @ changeset: 17:980a0f608481 |
760 | tag: tip |
760 | tag: tip |
761 | topic: watwat |
761 | topic: watwat |
762 | parent: 13:686a642006db |
762 | parent: 13:686a642006db |
763 | user: test |
763 | user: test |
764 | date: Thu Jan 01 00:00:00 1970 +0000 |
764 | date: Thu Jan 01 00:00:00 1970 +0000 |
773 | |
773 | |
774 |
774 |
775 Using the current flag |
775 Using the current flag |
776 |
776 |
777 $ hg topic changewat |
777 $ hg topic changewat |
778 $ hg topics --rev '13::19' --current |
778 $ hg topics --rev '13::17' --current |
779 changed topic on 2 changes |
779 changed topic on 2 changes |
780 |
780 |
781 $ hg log -Gr 'draft()' |
781 $ hg log -Gr 'draft()' |
782 @ changeset: 21:56c83be6105f |
782 @ changeset: 19:56c83be6105f |
783 | tag: tip |
783 | tag: tip |
784 | topic: changewat |
784 | topic: changewat |
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 |
787 | summary: fran? |
787 | summary: fran? |
788 | |
788 | |
789 o changeset: 20:ceba5be9d56f |
789 o changeset: 18:ceba5be9d56f |
790 | topic: changewat |
790 | topic: changewat |
791 | parent: 3:a53952faf762 |
791 | parent: 3:a53952faf762 |
792 | user: test |
792 | user: test |
793 | date: Thu Jan 01 00:00:00 1970 +0000 |
793 | date: Thu Jan 01 00:00:00 1970 +0000 |
794 | summary: start on fran |
794 | summary: start on fran |
802 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
802 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
803 $ echo gamma >> gamma |
803 $ echo gamma >> gamma |
804 $ hg ci -m gamma |
804 $ hg ci -m gamma |
805 |
805 |
806 $ hg log -Gr 'draft()' |
806 $ hg log -Gr 'draft()' |
807 @ changeset: 22:0d3d805542b4 |
807 @ changeset: 20:0d3d805542b4 |
808 | tag: tip |
808 | tag: tip |
809 | topic: changewat |
809 | topic: changewat |
810 | parent: 20:ceba5be9d56f |
810 | parent: 18:ceba5be9d56f |
811 | user: test |
811 | user: test |
812 | date: Thu Jan 01 00:00:00 1970 +0000 |
812 | date: Thu Jan 01 00:00:00 1970 +0000 |
813 | summary: gamma |
813 | summary: gamma |
814 | |
814 | |
815 | o changeset: 21:56c83be6105f |
815 | o changeset: 19:56c83be6105f |
816 |/ topic: changewat |
816 |/ topic: changewat |
817 | user: test |
817 | user: test |
818 | date: Thu Jan 01 00:00:00 1970 +0000 |
818 | date: Thu Jan 01 00:00:00 1970 +0000 |
819 | summary: fran? |
819 | summary: fran? |
820 | |
820 | |
821 o changeset: 20:ceba5be9d56f |
821 o changeset: 18:ceba5be9d56f |
822 | topic: changewat |
822 | topic: changewat |
823 | parent: 3:a53952faf762 |
823 | parent: 3:a53952faf762 |
824 | user: test |
824 | user: test |
825 | date: Thu Jan 01 00:00:00 1970 +0000 |
825 | date: Thu Jan 01 00:00:00 1970 +0000 |
826 | summary: start on fran |
826 | summary: start on fran |
829 $ hg topics --rev 't1::' changewut |
829 $ hg topics --rev 't1::' changewut |
830 switching to topic changewut |
830 switching to topic changewut |
831 changed topic on 3 changes |
831 changed topic on 3 changes |
832 |
832 |
833 $ hg log -Gr 'draft()' |
833 $ hg log -Gr 'draft()' |
834 @ changeset: 25:729ed5717393 |
834 @ changeset: 23:729ed5717393 |
835 | tag: tip |
835 | tag: tip |
836 | topic: changewut |
836 | topic: changewut |
837 | parent: 23:62e49f09f883 |
837 | parent: 21:62e49f09f883 |
838 | user: test |
838 | user: test |
839 | date: Thu Jan 01 00:00:00 1970 +0000 |
839 | date: Thu Jan 01 00:00:00 1970 +0000 |
840 | summary: gamma |
840 | summary: gamma |
841 | |
841 | |
842 | o changeset: 24:369c6e2e5474 |
842 | o changeset: 22:369c6e2e5474 |
843 |/ topic: changewut |
843 |/ topic: changewut |
844 | user: test |
844 | user: test |
845 | date: Thu Jan 01 00:00:00 1970 +0000 |
845 | date: Thu Jan 01 00:00:00 1970 +0000 |
846 | summary: fran? |
846 | summary: fran? |
847 | |
847 | |
848 o changeset: 23:62e49f09f883 |
848 o changeset: 21:62e49f09f883 |
849 | topic: changewut |
849 | topic: changewut |
850 | parent: 3:a53952faf762 |
850 | parent: 3:a53952faf762 |
851 | user: test |
851 | user: test |
852 | date: Thu Jan 01 00:00:00 1970 +0000 |
852 | date: Thu Jan 01 00:00:00 1970 +0000 |
853 | summary: start on fran |
853 | summary: start on fran |