Mercurial > evolve
comparison tests/test-push-checkheads-pruned-B4.t @ 2798:2280461343e5 mercurial-4.2
test-compat: merge mercurial-4.2 with the new stable branch content
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 25 Jul 2017 03:41:15 +0200 |
parents | 21f06d932231 |
children | 9c9c8c1eeb93 |
comparison
equal
deleted
inserted
replaced
2797:74456bc055ae | 2798:2280461343e5 |
---|---|
58 $ hg up 0 | 58 $ hg up 0 |
59 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 59 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
60 $ mkcommit C0 | 60 $ mkcommit C0 |
61 created new head | 61 created new head |
62 $ hg debugobsolete --record-parents `getid "desc(A0)"` | 62 $ hg debugobsolete --record-parents `getid "desc(A0)"` |
63 obsoleted 1 changesets | |
64 $ hg debugobsolete --record-parents `getid "desc(B0)"` | 63 $ hg debugobsolete --record-parents `getid "desc(B0)"` |
65 obsoleted 1 changesets | |
66 $ hg log -G --hidden | 64 $ hg log -G --hidden |
67 @ 0f88766e02d6 (draft): C0 | 65 @ 0f88766e02d6 (draft): C0 |
68 | | 66 | |
69 | x d73caddc5533 (draft): B0 | 67 | x d73caddc5533 (draft): B0 |
70 | | | 68 | | |
82 adding changesets | 80 adding changesets |
83 adding manifests | 81 adding manifests |
84 adding file changes | 82 adding file changes |
85 added 1 changesets with 1 changes to 1 files (+1 heads) | 83 added 1 changesets with 1 changes to 1 files (+1 heads) |
86 2 new obsolescence markers | 84 2 new obsolescence markers |
87 obsoleted 2 changesets | |
88 | 85 |
89 $ cd ../.. | 86 $ cd ../.. |