Mercurial > evolve
comparison tests/test-exchange-obsmarkers-case-C4.t @ 4552:0eb80259f9cb mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sat, 20 Apr 2019 03:55:11 +0200 |
| parents | d5adce52cef4 |
| children | 98941c28f3e2 |
comparison
equal
deleted
inserted
replaced
| 4551:7de160f6c7a9 | 4552:0eb80259f9cb |
|---|---|
| 65 $ mkcommit C | 65 $ mkcommit C |
| 66 created new head | 66 created new head |
| 67 $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(B)'` | 67 $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(B)'` |
| 68 obsoleted 1 changesets | 68 obsoleted 1 changesets |
| 69 $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(C)'` | 69 $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(C)'` |
| 70 2 new content-divergent changesets | |
| 71 $ hg prune -qd '0 0' . | 70 $ hg prune -qd '0 0' . |
| 72 $ hg log -G --hidden | 71 $ hg log -G --hidden |
| 73 x 7f7f229b13a6 (draft): C | 72 x 7f7f229b13a6 (draft): C |
| 74 | | 73 | |
| 75 | o 35b183996678 (draft): B | 74 | o 35b183996678 (draft): B |