comparison tests/test-push-checkheads-mixed-branch-topic-G2.t @ 5234:35e769c9604f mercurial-5.1

test-compat: merge mercurial-5.2 into mercurial-5.1
author Anton Shestakov <av6@dwimlabs.net>
date Wed, 08 Apr 2020 01:16:53 +0800
parents c6a84c6a26b8
children b1d010b2e6c4
comparison
equal deleted inserted replaced
5233:6434f3c4f7aa 5234:35e769c9604f
69 $ mkcommit A1 69 $ mkcommit A1
70 created new head 70 created new head
71 (consider using topic for lightweight branches. See 'hg help topic') 71 (consider using topic for lightweight branches. See 'hg help topic')
72 $ mkcommit C1 72 $ mkcommit C1
73 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` 73 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
74 1 new obsolescence markers
75 obsoleted 1 changesets 74 obsoleted 1 changesets
76 2 new orphan changesets 75 2 new orphan changesets
77 $ hg debugobsolete `getid "desc(C0)" ` `getid "desc(C1)"` 76 $ hg debugobsolete `getid "desc(C0)" ` `getid "desc(C1)"`
78 1 new obsolescence markers
79 obsoleted 1 changesets 77 obsoleted 1 changesets
80 $ hg log -G --hidden 78 $ hg log -G --hidden
81 @ 0c76bc104656 (draft): C1 79 @ 0c76bc104656 (draft): C1
82 | 80 |
83 o f6082bc4ffef (draft): A1 81 o f6082bc4ffef (draft): A1