comparison tests/test-push-checkheads-pruned-B7.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
children
comparison
equal deleted inserted replaced
3107:1f61525727bf 3108:9c9c8c1eeb93
49 created new head 49 created new head
50 $ mkcommit A1 50 $ mkcommit A1
51 $ hg up 'desc(B0)' 51 $ hg up 'desc(B0)'
52 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 52 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
53 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"` 53 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"`
54 obsoleted 1 changesets
55 $ hg debugobsolete --record-parents `getid "desc(A1)"` 54 $ hg debugobsolete --record-parents `getid "desc(A1)"`
56 obsoleted 1 changesets
57 $ hg log -G --hidden 55 $ hg log -G --hidden
58 x ba93660aff8d (draft): A1 56 x ba93660aff8d (draft): A1
59 | 57 |
60 @ 74ff5441d343 (draft): B0 58 @ 74ff5441d343 (draft): B0
61 | 59 |
73 adding changesets 71 adding changesets
74 adding manifests 72 adding manifests
75 adding file changes 73 adding file changes
76 added 1 changesets with 1 changes to 1 files (+1 heads) 74 added 1 changesets with 1 changes to 1 files (+1 heads)
77 2 new obsolescence markers 75 2 new obsolescence markers
78 obsoleted 1 changesets
79 76
80 $ cd ../.. 77 $ cd ../..