comparison tests/test-exchange-obsmarkers-case-B5.t @ 2798:2280461343e5 mercurial-4.2

test-compat: merge mercurial-4.2 with the new stable branch content
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 25 Jul 2017 03:41:15 +0200
parents 21f06d932231
children 9c9c8c1eeb93
comparison
equal deleted inserted replaced
2797:74456bc055ae 2798:2280461343e5
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 obsoleted 1 changesets
74 $ hg debugobsolete --hidden aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(B0)'` 73 $ hg debugobsolete --hidden aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(B0)'`
75 $ hg debugobsolete --hidden `getid 'desc(B0)'` `getid 'desc(B1)'` 74 $ hg debugobsolete --hidden `getid 'desc(B0)'` `getid 'desc(B1)'`
76 obsoleted 1 changesets
77 $ hg prune -qd '0 0' 'desc(B1)' 75 $ hg prune -qd '0 0' 'desc(B1)'
78 $ hg log -G --hidden 76 $ hg log -G --hidden
79 x 069b05c3876d (draft): B1 77 x 069b05c3876d (draft): B1
80 | 78 |
81 @ e5ea8f9c7314 (draft): A1 79 @ e5ea8f9c7314 (draft): A1