comparison tests/test-push-checkheads-pruned-B1.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 2280461343e5
children
comparison
equal deleted inserted replaced
3273:c0ee9ddfd5ff 3274:ddbb4d069203
47 $ hg up 0 47 $ hg up 0
48 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 48 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
49 $ mkcommit B0 49 $ mkcommit B0
50 created new head 50 created new head
51 $ hg debugobsolete --record-parents `getid "desc(A0)"` 51 $ hg debugobsolete --record-parents `getid "desc(A0)"`
52 obsoleted 1 changesets
53 $ hg log -G --hidden 52 $ hg log -G --hidden
54 @ 74ff5441d343 (draft): B0 53 @ 74ff5441d343 (draft): B0
55 | 54 |
56 | x 8aaa48160adc (draft): A0 55 | x 8aaa48160adc (draft): A0
57 |/ 56 |/
67 adding changesets 66 adding changesets
68 adding manifests 67 adding manifests
69 adding file changes 68 adding file changes
70 added 1 changesets with 1 changes to 1 files (+1 heads) 69 added 1 changesets with 1 changes to 1 files (+1 heads)
71 1 new obsolescence markers 70 1 new obsolescence markers
72 obsoleted 1 changesets
73 71
74 $ cd ../.. 72 $ cd ../..