Mercurial > evolve
comparison tests/test-push-checkheads-unpushed-D4.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 |
|---|---|
| 80 created new head | 80 created new head |
| 81 $ hg up 'desc(C0)' | 81 $ hg up 'desc(C0)' |
| 82 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 82 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 83 $ mkcommit B1 | 83 $ mkcommit B1 |
| 84 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` | 84 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` |
| 85 obsoleted 1 changesets | |
| 86 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` | 85 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` |
| 87 obsoleted 1 changesets | |
| 88 $ hg log -G --hidden | 86 $ hg log -G --hidden |
| 89 @ d70a1f75a020 (draft): B1 | 87 @ d70a1f75a020 (draft): B1 |
| 90 | | 88 | |
| 91 | o f6082bc4ffef (draft): A1 | 89 | o f6082bc4ffef (draft): A1 |
| 92 | | | 90 | | |
| 118 adding changesets | 116 adding changesets |
| 119 adding manifests | 117 adding manifests |
| 120 adding file changes | 118 adding file changes |
| 121 added 1 changesets with 1 changes to 1 files | 119 added 1 changesets with 1 changes to 1 files |
| 122 1 new obsolescence markers | 120 1 new obsolescence markers |
| 123 obsoleted 1 changesets | |
| 124 | 121 |
| 125 $ cd ../.. | 122 $ cd ../.. |