Mercurial > evolve
comparison tests/test-push-checkheads-pruned-B8.t @ 4892:38079b848657
branching: merge back into default
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sat, 05 Oct 2019 14:31:19 -0400 |
| parents | a8ff17479fb8 |
| children | f3e39a354378 144d10e74757 |
comparison
equal
deleted
inserted
replaced
| 4891:a9929dd36405 | 4892:38079b848657 |
|---|---|
| 65 $ hg up 0 | 65 $ hg up 0 |
| 66 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | 66 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
| 67 $ mkcommit A2 | 67 $ mkcommit A2 |
| 68 created new head | 68 created new head |
| 69 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` | 69 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` |
| 70 1 new obsolescence markers | |
| 70 obsoleted 1 changesets | 71 obsoleted 1 changesets |
| 71 1 new orphan changesets | 72 1 new orphan changesets |
| 72 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` | 73 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` |
| 74 1 new obsolescence markers | |
| 73 obsoleted 1 changesets | 75 obsoleted 1 changesets |
| 74 $ hg debugobsolete --record-parents `getid "desc(B1)"` | 76 $ hg debugobsolete --record-parents `getid "desc(B1)"` |
| 77 1 new obsolescence markers | |
| 75 obsoleted 1 changesets | 78 obsoleted 1 changesets |
| 76 $ hg debugobsolete `getid "desc(A1)" ` `getid "desc(A2)"` | 79 $ hg debugobsolete `getid "desc(A1)" ` `getid "desc(A2)"` |
| 80 1 new obsolescence markers | |
| 77 obsoleted 1 changesets | 81 obsoleted 1 changesets |
| 78 $ hg log -G --hidden | 82 $ hg log -G --hidden |
| 79 @ c1f8d089020f (draft): A2 | 83 @ c1f8d089020f (draft): A2 |
| 80 | | 84 | |
| 81 | x 262c8c798096 (draft): B1 | 85 | x 262c8c798096 (draft): B1 |