comparison tests/test-push-checkheads-pruned-B3.t @ 4173:e268f7fd7839 mercurial-4.4

test-compat: merge mercurial-4.5 into mercurial-4.4
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 12 Oct 2018 15:15:09 +0200
parents d5adce52cef4 ccbfbeee6cf3
children e07e764c0f48 04aeaec6ec07
comparison
equal deleted inserted replaced
4172:35c21ab64420 4173:e268f7fd7839
59 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 59 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
60 $ mkcommit B1 60 $ mkcommit B1
61 created new head 61 created new head
62 $ hg debugobsolete --record-parents `getid "desc(A0)"` 62 $ hg debugobsolete --record-parents `getid "desc(A0)"`
63 obsoleted 1 changesets 63 obsoleted 1 changesets
64 1 new orphan changesets
65 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` 64 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
66 obsoleted 1 changesets 65 obsoleted 1 changesets
67 $ hg log -G --hidden 66 $ hg log -G --hidden
68 @ 25c56d33e4c4 (draft): B1 67 @ 25c56d33e4c4 (draft): B1
69 | 68 |