comparison tests/test-push-checkheads-unpushed-D6.t @ 2798:2280461343e5 mercurial-4.2

test-compat: merge mercurial-4.2 with the new stable branch content
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 25 Jul 2017 03:41:15 +0200
parents 21f06d932231
children
comparison
equal deleted inserted replaced
2797:74456bc055ae 2798:2280461343e5
54 $ hg up '0' 54 $ hg up '0'
55 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 55 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
56 $ mkcommit C0 56 $ mkcommit C0
57 created new head 57 created new head
58 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"` 58 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"`
59 obsoleted 1 changesets
60 $ hg debugobsolete --record-parents `getid "desc(A1)"` 59 $ hg debugobsolete --record-parents `getid "desc(A1)"`
61 obsoleted 1 changesets
62 $ hg log -G --hidden 60 $ hg log -G --hidden
63 @ 0f88766e02d6 (draft): C0 61 @ 0f88766e02d6 (draft): C0
64 | 62 |
65 | x ba93660aff8d (draft): A1 63 | x ba93660aff8d (draft): A1
66 | | 64 | |