Mercurial > evolve
comparison tests/test-push-checkheads-unpushed-D2.t @ 4363:a2fdbece7ce1 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 22 Jan 2019 12:57:25 -0500 |
| parents | 04aeaec6ec07 |
| children | 3d917da5bd95 |
comparison
equal
deleted
inserted
replaced
| 4362:8bd60e09dfb4 | 4363:a2fdbece7ce1 |
|---|---|
| 63 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 63 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 64 $ mkcommit A1 | 64 $ mkcommit A1 |
| 65 created new head | 65 created new head |
| 66 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` | 66 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` |
| 67 obsoleted 1 changesets | 67 obsoleted 1 changesets |
| 68 1 new orphan changesets | |
| 69 $ hg debugobsolete --record-parents `getid "desc(B0)"` | 68 $ hg debugobsolete --record-parents `getid "desc(B0)"` |
| 70 obsoleted 1 changesets | 69 obsoleted 1 changesets |
| 71 $ hg up 0 | 70 $ hg up 0 |
| 72 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 71 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 73 $ mkcommit C0 | 72 $ mkcommit C0 |