Mercurial > evolve
comparison tests/test-push-checkheads-superceed-A6.t @ 3108:9c9c8c1eeb93 mercurial-4.2
test-compat: merge with mercurial-4.3 branch
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 20 Oct 2017 18:34:22 +0200 |
parents | 2280461343e5 ccfcacc5ee7c |
children | 7a5c3175015e |
comparison
equal
deleted
inserted
replaced
3107:1f61525727bf | 3108:9c9c8c1eeb93 |
---|---|
66 created new head | 66 created new head |
67 $ hg up 'desc(C0)' | 67 $ hg up 'desc(C0)' |
68 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 68 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
69 $ mkcommit B1 | 69 $ mkcommit B1 |
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 @ d70a1f75a020 (draft): B1 | 73 @ d70a1f75a020 (draft): B1 |
76 | | 74 | |
77 | o f6082bc4ffef (draft): A1 | 75 | o f6082bc4ffef (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 ../.. |