comparison tests/test-exchange-obsmarkers-case-A5.t @ 6814:c203bc3114bb mercurial-5.1

test-compat: merge mercurial-5.2 into mercurial-5.1
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 27 Jun 2024 01:07:01 +0400
parents f3e39a354378
children 9f69164cdc16
comparison
equal deleted inserted replaced
6813:3c880848174c 6814:c203bc3114bb
63 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 63 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
64 $ mkcommit B1 64 $ mkcommit B1
65 created new head 65 created new head
66 $ mkcommit A1 66 $ mkcommit A1
67 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'` 67 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'`
68 1 new obsolescence markers
69 $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'` 68 $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
70 1 new obsolescence markers
71 obsoleted 1 changesets 69 obsoleted 1 changesets
72 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` 70 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
73 1 new obsolescence markers
74 obsoleted 1 changesets 71 obsoleted 1 changesets
75 $ hg log -G --hidden 72 $ hg log -G --hidden
76 @ 8c0a98c83722 (draft): A1 73 @ 8c0a98c83722 (draft): A1
77 | 74 |
78 o f6298a8ac3a4 (draft): B1 75 o f6298a8ac3a4 (draft): B1