comparison tests/test-push-checkheads-superceed-A2.t @ 3274:ddbb4d069203 mercurial-4.2

test-compat: merge mercurial-4.3 into mercurial-4.2
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 11 Dec 2017 09:33:16 +0100
parents 9c9c8c1eeb93
children 7a5c3175015e
comparison
equal deleted inserted replaced
3273:c0ee9ddfd5ff 3274:ddbb4d069203
57 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 57 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
58 $ mkcommit A1 58 $ mkcommit A1
59 created new head 59 created new head
60 $ mkcommit B1 60 $ mkcommit B1
61 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` 61 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
62 obsoleted 1 changesets
63 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` 62 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
64 obsoleted 1 changesets
65 $ hg log -G --hidden 63 $ hg log -G --hidden
66 @ 262c8c798096 (draft): B1 64 @ 262c8c798096 (draft): B1
67 | 65 |
68 o f6082bc4ffef (draft): A1 66 o f6082bc4ffef (draft): A1
69 | 67 |
83 adding changesets 81 adding changesets
84 adding manifests 82 adding manifests
85 adding file changes 83 adding file changes
86 added 2 changesets with 2 changes to 2 files (+1 heads) 84 added 2 changesets with 2 changes to 2 files (+1 heads)
87 2 new obsolescence markers 85 2 new obsolescence markers
88 obsoleted 2 changesets
89 86
90 $ cd ../.. 87 $ cd ../..