Mercurial > evolve
comparison tests/test-push-checkheads-unpushed-D6.t @ 5636:3f9ef377e670 mercurial-5.1
test-compat: merge mercurial-5.2 into mercurial-5.1
# no-check-commit
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Sat, 31 Oct 2020 19:10:55 +0800 |
| parents | 8d20c0af010a |
| children | 669270305ccb |
comparison
equal
deleted
inserted
replaced
| 5635:a34b5cf906c6 | 5636:3f9ef377e670 |
|---|---|
| 54 $ hg up '0' | 54 $ hg up '0' |
| 55 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | 55 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
| 56 $ mkcommit C0 | 56 $ mkcommit C0 |
| 57 created new head | 57 created new head |
| 58 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"` | 58 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"` |
| 59 1 new obsolescence markers | |
| 60 obsoleted 1 changesets | 59 obsoleted 1 changesets |
| 61 $ hg debugobsolete --record-parents `getid "desc(A1)"` | 60 $ hg debugobsolete --record-parents `getid "desc(A1)"` |
| 62 1 new obsolescence markers | |
| 63 obsoleted 1 changesets | 61 obsoleted 1 changesets |
| 64 $ hg log -G --hidden | 62 $ hg log -G --hidden |
| 65 @ 0f88766e02d6 (draft): C0 | 63 @ 0f88766e02d6 (draft): C0 |
| 66 | | 64 | |
| 67 | x ba93660aff8d (draft): A1 | 65 | x ba93660aff8d (draft): A1 |