comparison tests/test-exchange-obsmarkers-case-C2.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
60 $ hg prune -qd '0 0' . 60 $ hg prune -qd '0 0' .
61 $ hg update -q 0 61 $ hg update -q 0
62 $ mkcommit A1 62 $ mkcommit A1
63 created new head 63 created new head
64 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` 64 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
65 obsoleted 1 changesets
66 $ hg log -G --hidden 65 $ hg log -G --hidden
67 @ e5ea8f9c7314 (draft): A1 66 @ e5ea8f9c7314 (draft): A1
68 | 67 |
69 | x 06055a7959d4 (draft): B 68 | x 06055a7959d4 (draft): B
70 | | 69 | |