comparison tests/test-push-checkheads-pruned-B8.t @ 5636:3f9ef377e670 mercurial-5.1

test-compat: merge mercurial-5.2 into mercurial-5.1 # no-check-commit
author Anton Shestakov <av6@dwimlabs.net>
date Sat, 31 Oct 2020 19:10:55 +0800
parents f3e39a354378
children 9f69164cdc16 df773a9bed0c
comparison
equal deleted inserted replaced
5635:a34b5cf906c6 5636:3f9ef377e670
65 $ hg up 0 65 $ hg up 0
66 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 66 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
67 $ mkcommit A2 67 $ mkcommit A2
68 created new head 68 created new head
69 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` 69 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
70 1 new obsolescence markers
71 obsoleted 1 changesets 70 obsoleted 1 changesets
72 1 new orphan changesets 71 1 new orphan changesets
73 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` 72 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
74 1 new obsolescence markers
75 obsoleted 1 changesets 73 obsoleted 1 changesets
76 $ hg debugobsolete --record-parents `getid "desc(B1)"` 74 $ hg debugobsolete --record-parents `getid "desc(B1)"`
77 1 new obsolescence markers
78 obsoleted 1 changesets 75 obsoleted 1 changesets
79 $ hg debugobsolete `getid "desc(A1)" ` `getid "desc(A2)"` 76 $ hg debugobsolete `getid "desc(A1)" ` `getid "desc(A2)"`
80 1 new obsolescence markers
81 obsoleted 1 changesets 77 obsoleted 1 changesets
82 $ hg log -G --hidden 78 $ hg log -G --hidden
83 @ c1f8d089020f (draft): A2 79 @ c1f8d089020f (draft): A2
84 | 80 |
85 | x 262c8c798096 (draft): B1 81 | x 262c8c798096 (draft): B1