Mercurial > evolve
comparison tests/test-push-checkheads-unpushed-D2.t @ 3930:d00f0c369bc7 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 02 Aug 2018 02:47:44 +0200 |
| parents | d5adce52cef4 |
| children | 98941c28f3e2 e268f7fd7839 |
comparison
equal
deleted
inserted
replaced
| 3929:e709e3817d7e | 3930:d00f0c369bc7 |
|---|---|
| 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 |