Mercurial > evolve
comparison tests/test-push-checkheads-superceed-A7.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 |
comparison
equal
deleted
inserted
replaced
4891:a9929dd36405 | 4892:38079b848657 |
---|---|
67 $ hg up 0 | 67 $ hg up 0 |
68 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | 68 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
69 $ mkcommit B1 | 69 $ mkcommit B1 |
70 created new head | 70 created new head |
71 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` | 71 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` |
72 1 new obsolescence markers | |
72 obsoleted 1 changesets | 73 obsoleted 1 changesets |
73 1 new orphan changesets | 74 1 new orphan changesets |
74 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` | 75 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` |
76 1 new obsolescence markers | |
75 obsoleted 1 changesets | 77 obsoleted 1 changesets |
76 $ hg log -G --hidden | 78 $ hg log -G --hidden |
77 @ 25c56d33e4c4 (draft): B1 | 79 @ 25c56d33e4c4 (draft): B1 |
78 | | 80 | |
79 | o a0802eb7fc1b (draft): A1 | 81 | o a0802eb7fc1b (draft): A1 |