comparison tests/test-push-checkheads-unpushed-D5.t @ 3108:9c9c8c1eeb93 mercurial-4.2

test-compat: merge with mercurial-4.3 branch
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 20 Oct 2017 18:34:22 +0200
parents 2280461343e5 ccfcacc5ee7c
children 7a5c3175015e
comparison
equal deleted inserted replaced
3107:1f61525727bf 3108:9c9c8c1eeb93
69 $ hg up 0 69 $ hg up 0
70 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 70 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
71 $ mkcommit B1 71 $ mkcommit B1
72 created new head 72 created new head
73 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` 73 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
74 obsoleted 1 changesets
75 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` 74 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
76 obsoleted 1 changesets
77 $ hg log -G --hidden 75 $ hg log -G --hidden
78 @ 25c56d33e4c4 (draft): B1 76 @ 25c56d33e4c4 (draft): B1
79 | 77 |
80 | o a0802eb7fc1b (draft): A1 78 | o a0802eb7fc1b (draft): A1
81 | | 79 | |
103 adding changesets 101 adding changesets
104 adding manifests 102 adding manifests
105 adding file changes 103 adding file changes
106 added 1 changesets with 1 changes to 1 files 104 added 1 changesets with 1 changes to 1 files
107 1 new obsolescence markers 105 1 new obsolescence markers
108 obsoleted 1 changesets
109 106
110 $ cd ../.. 107 $ cd ../..