comparison tests/test-exchange-obsmarkers-case-C4.t @ 3274:ddbb4d069203 mercurial-4.2

test-compat: merge mercurial-4.3 into mercurial-4.2
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 11 Dec 2017 09:33:16 +0100
parents 2280461343e5
children 7a5c3175015e
comparison
equal deleted inserted replaced
3273:c0ee9ddfd5ff 3274:ddbb4d069203
63 created new head 63 created new head
64 $ hg update -q 0 64 $ hg update -q 0
65 $ mkcommit C 65 $ mkcommit C
66 created new head 66 created new head
67 $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(B)'` 67 $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(B)'`
68 obsoleted 1 changesets
69 $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(C)'` 68 $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(C)'`
70 $ hg prune -qd '0 0' . 69 $ hg prune -qd '0 0' .
71 $ hg log -G --hidden 70 $ hg log -G --hidden
72 x 7f7f229b13a6 (draft): C 71 x 7f7f229b13a6 (draft): C
73 | 72 |