equal
deleted
inserted
replaced
589 adding A0 |
589 adding A0 |
590 adding B0 |
590 adding B0 |
591 created new head |
591 created new head |
592 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"` |
592 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"` |
593 obsoleted 1 changesets |
593 obsoleted 1 changesets |
|
594 1 new orphan changesets |
594 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"` |
595 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"` |
595 obsoleted 1 changesets |
596 obsoleted 1 changesets |
596 |
597 |
597 $ hg log --hidden -G |
598 $ hg log --hidden -G |
598 @ changeset: 3:eb5a0daa2192 |
599 @ changeset: 3:eb5a0daa2192 |
815 |
816 |
816 $ hg update --hidden 'desc(A0)' |
817 $ hg update --hidden 'desc(A0)' |
817 updating to a hidden changeset 471f378eab4c |
818 updating to a hidden changeset 471f378eab4c |
818 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
819 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
819 $ hg commit --amend -m "A2" |
820 $ hg commit --amend -m "A2" |
|
821 2 new content-divergent changesets |
820 $ hg log --hidden -G |
822 $ hg log --hidden -G |
821 @ changeset: 3:65b757b745b9 |
823 @ changeset: 3:65b757b745b9 |
822 | tag: tip |
824 | tag: tip |
823 | parent: 0:ea207398892e |
825 | parent: 0:ea207398892e |
824 | user: test |
826 | user: test |
1110 adding A0 |
1112 adding A0 |
1111 adding B0 |
1113 adding B0 |
1112 created new head |
1114 created new head |
1113 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"` |
1115 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"` |
1114 obsoleted 1 changesets |
1116 obsoleted 1 changesets |
|
1117 1 new orphan changesets |
1115 $ hg debugobsolete `getid "desc(B1)"` `getid "desc(C0)"` |
1118 $ hg debugobsolete `getid "desc(B1)"` `getid "desc(C0)"` |
1116 obsoleted 1 changesets |
1119 obsoleted 1 changesets |
1117 |
1120 |
1118 $ hg log --hidden -G |
1121 $ hg log --hidden -G |
1119 @ changeset: 4:eb5a0daa2192 |
1122 @ changeset: 4:eb5a0daa2192 |
1587 |
1590 |
1588 Create the cycle |
1591 Create the cycle |
1589 |
1592 |
1590 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"` |
1593 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"` |
1591 obsoleted 1 changesets |
1594 obsoleted 1 changesets |
|
1595 1 new orphan changesets |
1592 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"` |
1596 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"` |
1593 obsoleted 1 changesets |
1597 obsoleted 1 changesets |
1594 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"` |
1598 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"` |
1595 |
1599 |
1596 Check templates |
1600 Check templates |
1872 Diverge one of the splitted commit |
1876 Diverge one of the splitted commit |
1873 |
1877 |
1874 $ hg up 6 |
1878 $ hg up 6 |
1875 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1879 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1876 $ hg commit --amend -m "Add only B" |
1880 $ hg commit --amend -m "Add only B" |
|
1881 1 new orphan changesets |
1877 |
1882 |
1878 $ hg up 6 --hidden |
1883 $ hg up 6 --hidden |
1879 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1884 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1880 $ hg commit --amend -m "Add B only" |
1885 $ hg commit --amend -m "Add B only" |
|
1886 4 new content-divergent changesets |
1881 |
1887 |
1882 $ hg log -G |
1888 $ hg log -G |
1883 @ changeset: 9:0b997eb7ceee |
1889 @ changeset: 9:0b997eb7ceee |
1884 | tag: tip |
1890 | tag: tip |
1885 | parent: 5:dd800401bd8c |
1891 | parent: 5:dd800401bd8c |