comparison tests/test-push-checkheads-partial-C4.t @ 3590:d5adce52cef4 mercurial-4.4

test-compat: merge stable into mercurial-4.4
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 21 Mar 2018 16:06:17 +0100
parents 2e703ed1c713
children 98941c28f3e2 e268f7fd7839
comparison
equal deleted inserted replaced
3589:e4ac2e2c2086 3590:d5adce52cef4
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 C0 60 $ mkcommit C0
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 log -G --hidden 64 $ hg log -G --hidden
66 @ 0f88766e02d6 (draft): C0 65 @ 0f88766e02d6 (draft): C0
67 | 66 |
68 | * d73caddc5533 (draft): B0 67 | o d73caddc5533 (draft): B0
69 | | 68 | |
70 | x 8aaa48160adc (draft): A0 69 | x 8aaa48160adc (draft): A0
71 |/ 70 |/
72 o 1e4be0697311 (public): root 71 o 1e4be0697311 (public): root
73 72