comparison tests/test-push-checkheads-pruned-B5.t @ 3592:7a5c3175015e mercurial-4.2

test-compat: merge mercurial-4.3 into mercurial-4.2
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 21 Mar 2018 16:32:54 +0100
parents 98941c28f3e2 9c9c8c1eeb93
children
comparison
equal deleted inserted replaced
3591:98941c28f3e2 3592:7a5c3175015e
61 $ hg up 0 61 $ hg up 0
62 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 62 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
63 $ mkcommit B1 63 $ mkcommit B1
64 created new head 64 created new head
65 $ hg debugobsolete --record-parents `getid "desc(A0)"` 65 $ hg debugobsolete --record-parents `getid "desc(A0)"`
66 obsoleted 1 changesets
67 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(B1)"` 66 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(B1)"`
68 obsoleted 1 changesets
69 $ hg debugobsolete --record-parents `getid "desc(C0)"` 67 $ hg debugobsolete --record-parents `getid "desc(C0)"`
70 obsoleted 1 changesets
71 $ hg log -G --hidden 68 $ hg log -G --hidden
72 @ 25c56d33e4c4 (draft): B1 69 @ 25c56d33e4c4 (draft): B1
73 | 70 |
74 | x 821fb21d0dd2 (draft): C0 71 | x 821fb21d0dd2 (draft): C0
75 | | 72 | |
89 adding changesets 86 adding changesets
90 adding manifests 87 adding manifests
91 adding file changes 88 adding file changes
92 added 1 changesets with 1 changes to 1 files (+1 heads) 89 added 1 changesets with 1 changes to 1 files (+1 heads)
93 3 new obsolescence markers 90 3 new obsolescence markers
94 obsoleted 3 changesets
95 91
96 $ cd ../.. 92 $ cd ../..