comparison tests/test-push-checkheads-pruned-B6.t @ 4892:38079b848657

branching: merge back into default
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sat, 05 Oct 2019 14:31:19 -0400
parents a8ff17479fb8
children f3e39a354378 196ed65594dc
comparison
equal deleted inserted replaced
4891:a9929dd36405 4892:38079b848657
50 created new head 50 created new head
51 $ mkcommit A1 51 $ mkcommit A1
52 $ hg up 'desc(B0)' 52 $ hg up 'desc(B0)'
53 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 53 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
54 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"` 54 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"`
55 1 new obsolescence markers
55 obsoleted 1 changesets 56 obsoleted 1 changesets
56 $ hg debugobsolete --record-parents `getid "desc(A1)"` 57 $ hg debugobsolete --record-parents `getid "desc(A1)"`
58 1 new obsolescence markers
57 obsoleted 1 changesets 59 obsoleted 1 changesets
58 $ hg log -G --hidden 60 $ hg log -G --hidden
59 x ba93660aff8d (draft): A1 61 x ba93660aff8d (draft): A1
60 | 62 |
61 @ 74ff5441d343 (draft): B0 63 @ 74ff5441d343 (draft): B0