comparison tests/test-push-checkheads-pruned-B1.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 fc60328270ac
comparison
equal deleted inserted replaced
4891:a9929dd36405 4892:38079b848657
47 $ hg up 0 47 $ hg up 0
48 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 48 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
49 $ mkcommit B0 49 $ mkcommit B0
50 created new head 50 created new head
51 $ hg debugobsolete --record-parents `getid "desc(A0)"` 51 $ hg debugobsolete --record-parents `getid "desc(A0)"`
52 1 new obsolescence markers
52 obsoleted 1 changesets 53 obsoleted 1 changesets
53 $ hg log -G --hidden 54 $ hg log -G --hidden
54 @ 74ff5441d343 (draft): B0 55 @ 74ff5441d343 (draft): B0
55 | 56 |
56 | x 8aaa48160adc (draft): A0 57 | x 8aaa48160adc (draft): A0