126 $ hg parents |
126 $ hg parents |
127 changeset: 3:0d3f46688ccc |
127 changeset: 3:0d3f46688ccc |
128 parent: 1:7c3bad9141dc |
128 parent: 1:7c3bad9141dc |
129 user: test |
129 user: test |
130 date: Thu Jan 01 00:00:00 1970 +0000 |
130 date: Thu Jan 01 00:00:00 1970 +0000 |
131 obsolete: rewritten as 725c380fe99b |
131 obsolete: rewritten as 4:725c380fe99b |
132 summary: add obsol_c |
132 summary: add obsol_c |
133 |
133 |
134 working directory parent is obsolete! (0d3f46688ccc) |
134 working directory parent is obsolete! (0d3f46688ccc) |
135 (use 'hg evolve' to update to its successor: 725c380fe99b) |
135 (use 'hg evolve' to update to its successor: 725c380fe99b) |
136 $ mkcommit d # 5 (on 3) |
136 $ mkcommit d # 5 (on 3) |
754 | | | |
754 | | | |
755 | | | x changeset: 13:0b1b6dd009c0 |
755 | | | x changeset: 13:0b1b6dd009c0 |
756 | | |/ parent: 10:2033b4e49474 |
756 | | |/ parent: 10:2033b4e49474 |
757 | | | user: test |
757 | | | user: test |
758 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
758 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
759 | | | obsolete: amended as 705ab2a6b72e |
759 | | | obsolete: amended as 14:705ab2a6b72e |
760 | | | summary: add f |
760 | | | summary: add f |
761 | | | |
761 | | | |
762 | | | o changeset: 12:6db5e282cb91 |
762 | | | o changeset: 12:6db5e282cb91 |
763 | | |/ parent: 10:2033b4e49474 |
763 | | |/ parent: 10:2033b4e49474 |
764 | | | user: test |
764 | | | user: test |
786 | | |
786 | | |
787 | | x changeset: 8:159dfc9fa5d3 |
787 | | x changeset: 8:159dfc9fa5d3 |
788 | | | parent: 3:0d3f46688ccc |
788 | | | parent: 3:0d3f46688ccc |
789 | | | user: test |
789 | | | user: test |
790 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
790 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
791 | | | obsolete: rebased as 9468a5f5d8b2 |
791 | | | obsolete: rebased as 11:9468a5f5d8b2 |
792 | | | summary: add obsol_d'' |
792 | | | summary: add obsol_d'' |
793 | | | |
793 | | | |
794 | | | x changeset: 7:909a0fb57e5d |
794 | | | x changeset: 7:909a0fb57e5d |
795 | | |/ parent: 3:0d3f46688ccc |
795 | | |/ parent: 3:0d3f46688ccc |
796 | | | user: test |
796 | | | user: test |
797 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
797 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
798 | | | obsolete: rewritten as 159dfc9fa5d3 |
798 | | | obsolete: rewritten as 8:159dfc9fa5d3 |
799 | | | summary: add obsol_d' |
799 | | | summary: add obsol_d' |
800 | | | |
800 | | | |
801 | | | x changeset: 6:95de7fc6918d |
801 | | | x changeset: 6:95de7fc6918d |
802 | | |/ parent: 3:0d3f46688ccc |
802 | | |/ parent: 3:0d3f46688ccc |
803 | | | user: test |
803 | | | user: test |
804 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
804 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
805 | | | obsolete: rewritten as 909a0fb57e5d |
805 | | | obsolete: rewritten as 7:909a0fb57e5d |
806 | | | summary: add obsol_d |
806 | | | summary: add obsol_d |
807 | | | |
807 | | | |
808 | | | x changeset: 5:a7a6f2b5d8a5 |
808 | | | x changeset: 5:a7a6f2b5d8a5 |
809 | | |/ parent: 3:0d3f46688ccc |
809 | | |/ parent: 3:0d3f46688ccc |
810 | | | user: test |
810 | | | user: test |
811 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
811 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
812 | | | obsolete: rewritten as 95de7fc6918d |
812 | | | obsolete: rewritten as 6:95de7fc6918d |
813 | | | obsolete: rewritten as 50f11e5e3a63 |
813 | | | obsolete: rewritten as 15:50f11e5e3a63 |
814 | | | summary: add d |
814 | | | summary: add d |
815 | | | |
815 | | | |
816 | o | changeset: 4:725c380fe99b |
816 | o | changeset: 4:725c380fe99b |
817 | | | parent: 1:7c3bad9141dc |
817 | | | parent: 1:7c3bad9141dc |
818 | | | user: test |
818 | | | user: test |
821 | | | |
821 | | | |
822 | | x changeset: 3:0d3f46688ccc |
822 | | x changeset: 3:0d3f46688ccc |
823 | |/ parent: 1:7c3bad9141dc |
823 | |/ parent: 1:7c3bad9141dc |
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 | | obsolete: rewritten as 725c380fe99b |
826 | | obsolete: rewritten as 4:725c380fe99b |
827 | | obsolete: rebased as 2033b4e49474 |
827 | | obsolete: rebased as 10:2033b4e49474 |
828 | | summary: add obsol_c |
828 | | summary: add obsol_c |
829 | | |
829 | | |
830 x | changeset: 2:4538525df7e2 |
830 x | changeset: 2:4538525df7e2 |
831 |/ user: test |
831 |/ user: test |
832 | date: Thu Jan 01 00:00:00 1970 +0000 |
832 | date: Thu Jan 01 00:00:00 1970 +0000 |
833 | obsolete: rewritten as 0d3f46688ccc |
833 | obsolete: rewritten as 3:0d3f46688ccc |
834 | summary: add c |
834 | summary: add c |
835 | |
835 | |
836 o changeset: 1:7c3bad9141dc |
836 o changeset: 1:7c3bad9141dc |
837 | user: test |
837 | user: test |
838 | date: Thu Jan 01 00:00:00 1970 +0000 |
838 | date: Thu Jan 01 00:00:00 1970 +0000 |