comparison tests/test-push-checkheads-supersede-A2.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
58 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 58 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
59 $ mkcommit A1 59 $ mkcommit A1
60 created new head 60 created new head
61 $ mkcommit B1 61 $ mkcommit B1
62 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` 62 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
63 1 new obsolescence markers
64 obsoleted 1 changesets 63 obsoleted 1 changesets
65 1 new orphan changesets 64 1 new orphan changesets
66 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` 65 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
67 1 new obsolescence markers
68 obsoleted 1 changesets 66 obsoleted 1 changesets
69 $ hg log -G --hidden 67 $ hg log -G --hidden
70 @ 262c8c798096 (draft): B1 68 @ 262c8c798096 (draft): B1
71 | 69 |
72 o f6082bc4ffef (draft): A1 70 o f6082bc4ffef (draft): A1