comparison tests/test-exchange-obsmarkers-case-D1.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
59 $ mkcommit B 59 $ mkcommit B
60 $ hg up -q 0 60 $ hg up -q 0
61 $ mkcommit A1 61 $ mkcommit A1
62 created new head 62 created new head
63 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` 63 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
64 obsoleted 1 changesets
65 $ hg prune -d '0 0' 'desc(B)' 64 $ hg prune -d '0 0' 'desc(B)'
66 1 changesets pruned 65 1 changesets pruned
67 $ hg strip --hidden -q 'desc(A0)' --config devel.strip-obsmarkers=no 66 $ hg strip --hidden -q 'desc(A0)' --config devel.strip-obsmarkers=no
68 $ hg log -G --hidden 67 $ hg log -G --hidden
69 @ e5ea8f9c7314 (draft): A1 68 @ e5ea8f9c7314 (draft): A1