Mercurial > evolve
comparison tests/test-push-checkheads-superceed-A7.t @ 3167:f089741039e5 mercurial-4.2
test-compat: merge mercurial-4.3 into mercurial-4.2
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Wed, 01 Nov 2017 23:58:27 +0100 |
parents | 9c9c8c1eeb93 |
children | 7a5c3175015e |
comparison
equal
deleted
inserted
replaced
3166:e1a230cc4527 | 3167:f089741039e5 |
---|---|
66 $ hg up 0 | 66 $ hg up 0 |
67 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | 67 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
68 $ mkcommit B1 | 68 $ mkcommit B1 |
69 created new head | 69 created new head |
70 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` | 70 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` |
71 obsoleted 1 changesets | |
72 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` | 71 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` |
73 obsoleted 1 changesets | |
74 $ hg log -G --hidden | 72 $ hg log -G --hidden |
75 @ 25c56d33e4c4 (draft): B1 | 73 @ 25c56d33e4c4 (draft): B1 |
76 | | 74 | |
77 | o a0802eb7fc1b (draft): A1 | 75 | o a0802eb7fc1b (draft): A1 |
78 | | | 76 | | |
94 adding changesets | 92 adding changesets |
95 adding manifests | 93 adding manifests |
96 adding file changes | 94 adding file changes |
97 added 2 changesets with 2 changes to 2 files (+1 heads) | 95 added 2 changesets with 2 changes to 2 files (+1 heads) |
98 2 new obsolescence markers | 96 2 new obsolescence markers |
99 obsoleted 2 changesets | |
100 | 97 |
101 $ cd ../.. | 98 $ cd ../.. |