124 $ hg parents |
124 $ hg parents |
125 changeset: 3:0d3f46688ccc |
125 changeset: 3:0d3f46688ccc |
126 parent: 1:7c3bad9141dc |
126 parent: 1:7c3bad9141dc |
127 user: test |
127 user: test |
128 date: Thu Jan 01 00:00:00 1970 +0000 |
128 date: Thu Jan 01 00:00:00 1970 +0000 |
|
129 obsolete: rewritten as 725c380fe99b |
129 summary: add obsol_c |
130 summary: add obsol_c |
130 |
131 |
131 working directory parent is obsolete! (0d3f46688ccc) |
132 working directory parent is obsolete! (0d3f46688ccc) |
132 (use 'hg evolve' to update to its successor: 725c380fe99b) |
133 (use 'hg evolve' to update to its successor: 725c380fe99b) |
133 $ mkcommit d # 5 (on 3) |
134 $ mkcommit d # 5 (on 3) |
738 | | | summary: add f |
739 | | | summary: add f |
739 | | | |
740 | | | |
740 | | | x changeset: 14:33d458d86621 |
741 | | | x changeset: 14:33d458d86621 |
741 | | | | user: test |
742 | | | | user: test |
742 | | | | date: Thu Jan 01 00:00:00 1970 +0000 |
743 | | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
744 | | | | obsolete: pruned |
743 | | | | summary: temporary amend commit for 0b1b6dd009c0 |
745 | | | | summary: temporary amend commit for 0b1b6dd009c0 |
744 | | | | |
746 | | | | |
745 | | | x changeset: 13:0b1b6dd009c0 |
747 | | | x changeset: 13:0b1b6dd009c0 |
746 | | |/ parent: 10:2033b4e49474 |
748 | | |/ parent: 10:2033b4e49474 |
747 | | | user: test |
749 | | | user: test |
748 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
750 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
751 | | | obsolete: rewritten as 705ab2a6b72e |
749 | | | summary: add f |
752 | | | summary: add f |
750 | | | |
753 | | | |
751 | | | o changeset: 12:6db5e282cb91 |
754 | | | o changeset: 12:6db5e282cb91 |
752 | | |/ parent: 10:2033b4e49474 |
755 | | |/ parent: 10:2033b4e49474 |
753 | | | user: test |
756 | | | user: test |
768 | | |
771 | | |
769 | | x changeset: 9:83b5778897ad |
772 | | x changeset: 9:83b5778897ad |
770 | | parent: -1:000000000000 |
773 | | parent: -1:000000000000 |
771 | | user: test |
774 | | user: test |
772 | | date: Thu Jan 01 00:00:00 1970 +0000 |
775 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
776 | | obsolete: pruned |
773 | | summary: add toto |
777 | | summary: add toto |
774 | | |
778 | | |
775 | | x changeset: 8:159dfc9fa5d3 |
779 | | x changeset: 8:159dfc9fa5d3 |
776 | | | parent: 3:0d3f46688ccc |
780 | | | parent: 3:0d3f46688ccc |
777 | | | user: test |
781 | | | user: test |
778 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
782 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
783 | | | obsolete: rewritten as 9468a5f5d8b2 |
779 | | | summary: add obsol_d'' |
784 | | | summary: add obsol_d'' |
780 | | | |
785 | | | |
781 | | | x changeset: 7:909a0fb57e5d |
786 | | | x changeset: 7:909a0fb57e5d |
782 | | |/ parent: 3:0d3f46688ccc |
787 | | |/ parent: 3:0d3f46688ccc |
783 | | | user: test |
788 | | | user: test |
784 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
789 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
790 | | | obsolete: rewritten as 159dfc9fa5d3 |
785 | | | summary: add obsol_d' |
791 | | | summary: add obsol_d' |
786 | | | |
792 | | | |
787 | | | x changeset: 6:95de7fc6918d |
793 | | | x changeset: 6:95de7fc6918d |
788 | | |/ parent: 3:0d3f46688ccc |
794 | | |/ parent: 3:0d3f46688ccc |
789 | | | user: test |
795 | | | user: test |
790 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
796 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
797 | | | obsolete: rewritten as 909a0fb57e5d |
791 | | | summary: add obsol_d |
798 | | | summary: add obsol_d |
792 | | | |
799 | | | |
793 | | | x changeset: 5:a7a6f2b5d8a5 |
800 | | | x changeset: 5:a7a6f2b5d8a5 |
794 | | |/ parent: 3:0d3f46688ccc |
801 | | |/ parent: 3:0d3f46688ccc |
795 | | | user: test |
802 | | | user: test |
796 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
803 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
804 | | | obsolete: rewritten as 95de7fc6918d |
|
805 | | | obsolete: rewritten as 50f11e5e3a63 |
797 | | | summary: add d |
806 | | | summary: add d |
798 | | | |
807 | | | |
799 | o | changeset: 4:725c380fe99b |
808 | o | changeset: 4:725c380fe99b |
800 | | | parent: 1:7c3bad9141dc |
809 | | | parent: 1:7c3bad9141dc |
801 | | | user: test |
810 | | | user: test |
804 | | | |
813 | | | |
805 | | x changeset: 3:0d3f46688ccc |
814 | | x changeset: 3:0d3f46688ccc |
806 | |/ parent: 1:7c3bad9141dc |
815 | |/ parent: 1:7c3bad9141dc |
807 | | user: test |
816 | | user: test |
808 | | date: Thu Jan 01 00:00:00 1970 +0000 |
817 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
818 | | obsolete: rewritten as 725c380fe99b |
|
819 | | obsolete: rewritten as 2033b4e49474 |
809 | | summary: add obsol_c |
820 | | summary: add obsol_c |
810 | | |
821 | | |
811 x | changeset: 2:4538525df7e2 |
822 x | changeset: 2:4538525df7e2 |
812 |/ user: test |
823 |/ user: test |
813 | date: Thu Jan 01 00:00:00 1970 +0000 |
824 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
825 | obsolete: rewritten as 0d3f46688ccc |
814 | summary: add c |
826 | summary: add c |
815 | |
827 | |
816 o changeset: 1:7c3bad9141dc |
828 o changeset: 1:7c3bad9141dc |
817 | user: test |
829 | user: test |
818 | date: Thu Jan 01 00:00:00 1970 +0000 |
830 | date: Thu Jan 01 00:00:00 1970 +0000 |