comparison tests/test-push-checkheads-supersede-A6.t @ 6070:df773a9bed0c mercurial-5.1

test-compat: merge mercurial-5.2 into mercurial-5.1 # no-check-commit
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 12 Oct 2021 12:51:13 +0300
parents 144d10e74757
children 55e9987b8384 b1d010b2e6c4
comparison
equal deleted inserted replaced
6069:fff5ed792d8f 6070:df773a9bed0c
67 created new head 67 created new head
68 $ hg up 'desc(C0)' 68 $ hg up 'desc(C0)'
69 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 69 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
70 $ mkcommit B1 70 $ mkcommit B1
71 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` 71 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
72 1 new obsolescence markers
73 obsoleted 1 changesets 72 obsoleted 1 changesets
74 1 new orphan changesets 73 1 new orphan changesets
75 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` 74 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
76 1 new obsolescence markers
77 obsoleted 1 changesets 75 obsoleted 1 changesets
78 $ hg log -G --hidden 76 $ hg log -G --hidden
79 @ d70a1f75a020 (draft): B1 77 @ d70a1f75a020 (draft): B1
80 | 78 |
81 | o f6082bc4ffef (draft): A1 79 | o f6082bc4ffef (draft): A1