comparison tests/test-exchange-obsmarkers-case-B5.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
comparison
equal deleted inserted replaced
5635:a34b5cf906c6 5636:3f9ef377e670
68 $ hg up --quiet 0 68 $ hg up --quiet 0
69 $ mkcommit A1 69 $ mkcommit A1
70 created new head 70 created new head
71 $ mkcommit B1 71 $ mkcommit B1
72 $ hg debugobsolete --hidden `getid 'desc(A0)'` `getid 'desc(A1)'` 72 $ hg debugobsolete --hidden `getid 'desc(A0)'` `getid 'desc(A1)'`
73 1 new obsolescence markers
74 obsoleted 1 changesets 73 obsoleted 1 changesets
75 2 new orphan changesets 74 2 new orphan changesets
76 $ hg debugobsolete --hidden aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(B0)'` 75 $ hg debugobsolete --hidden aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(B0)'`
77 1 new obsolescence markers
78 $ hg debugobsolete --hidden `getid 'desc(B0)'` `getid 'desc(B1)'` 76 $ hg debugobsolete --hidden `getid 'desc(B0)'` `getid 'desc(B1)'`
79 1 new obsolescence markers
80 obsoleted 1 changesets 77 obsoleted 1 changesets
81 $ hg prune -qd '0 0' 'desc(B1)' 78 $ hg prune -qd '0 0' 'desc(B1)'
82 $ hg log -G --hidden 79 $ hg log -G --hidden
83 x 069b05c3876d (draft): B1 80 x 069b05c3876d (draft): B1
84 | 81 |