comparison tests/test-exchange-obsmarkers-case-D1.t @ 4173:e268f7fd7839 mercurial-4.4

test-compat: merge mercurial-4.5 into mercurial-4.4
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 12 Oct 2018 15:15:09 +0200
parents d5adce52cef4 ccbfbeee6cf3
children e07e764c0f48 04aeaec6ec07
comparison
equal deleted inserted replaced
4172:35c21ab64420 4173:e268f7fd7839
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 64 obsoleted 1 changesets
65 1 new orphan changesets
66 $ hg prune -d '0 0' 'desc(B)' 65 $ hg prune -d '0 0' 'desc(B)'
67 1 changesets pruned 66 1 changesets pruned
68 $ hg strip --hidden -q 'desc(A0)' --config devel.strip-obsmarkers=no 67 $ hg strip --hidden -q 'desc(A0)' --config devel.strip-obsmarkers=no
69 $ hg log -G --hidden 68 $ hg log -G --hidden
70 @ e5ea8f9c7314 (draft): A1 69 @ e5ea8f9c7314 (draft): A1