Mercurial > evolve
comparison tests/test-push-checkheads-pruned-B2.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 |
|---|---|
| 57 $ hg up 0 | 57 $ hg up 0 |
| 58 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 58 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 59 $ mkcommit A1 | 59 $ mkcommit A1 |
| 60 created new head | 60 created new head |
| 61 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` | 61 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` |
| 62 obsoleted 1 changesets | |
| 63 $ hg debugobsolete --record-parents `getid "desc(B0)"` | 62 $ hg debugobsolete --record-parents `getid "desc(B0)"` |
| 64 obsoleted 1 changesets | |
| 65 $ hg log -G --hidden | 63 $ hg log -G --hidden |
| 66 @ f6082bc4ffef (draft): A1 | 64 @ f6082bc4ffef (draft): A1 |
| 67 | | 65 | |
| 68 | x d73caddc5533 (draft): B0 | 66 | x d73caddc5533 (draft): B0 |
| 69 | | | 67 | | |
| 81 adding changesets | 79 adding changesets |
| 82 adding manifests | 80 adding manifests |
| 83 adding file changes | 81 adding file changes |
| 84 added 1 changesets with 1 changes to 1 files (+1 heads) | 82 added 1 changesets with 1 changes to 1 files (+1 heads) |
| 85 2 new obsolescence markers | 83 2 new obsolescence markers |
| 86 obsoleted 2 changesets | |
| 87 | 84 |
| 88 $ cd ../.. | 85 $ cd ../.. |