comparison tests/test-push-checkheads-unpushed-D2.t @ 3167:f089741039e5 mercurial-4.2

test-compat: merge mercurial-4.3 into mercurial-4.2
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 01 Nov 2017 23:58:27 +0100
parents 9c9c8c1eeb93
children 7a5c3175015e
comparison
equal deleted inserted replaced
3166:e1a230cc4527 3167:f089741039e5
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 A1 63 $ mkcommit A1
64 created new head 64 created new head
65 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` 65 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
66 obsoleted 1 changesets
67 $ hg debugobsolete --record-parents `getid "desc(B0)"` 66 $ hg debugobsolete --record-parents `getid "desc(B0)"`
68 obsoleted 1 changesets
69 $ hg up 0 67 $ hg up 0
70 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 68 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
71 $ mkcommit C0 69 $ mkcommit C0
72 created new head 70 created new head
73 $ hg log -G --hidden 71 $ hg log -G --hidden