Mercurial > evolve
comparison tests/test-sharing.t @ 3106:a867d59ea97a mercurial-4.3
test-compat: revert output changes from phase renaming
We keep using the old name for the older version. test has to reflect that.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 20 Oct 2017 20:04:13 +0200 |
| parents | f5d472b7e800 |
| children | 9c9c8c1eeb93 e1a230cc4527 |
comparison
equal
deleted
inserted
replaced
| 3105:f5d472b7e800 | 3106:a867d59ea97a |
|---|---|
| 492 adding manifests | 492 adding manifests |
| 493 adding file changes | 493 adding file changes |
| 494 added 1 changesets with 1 changes to 1 files (+1 heads) | 494 added 1 changesets with 1 changes to 1 files (+1 heads) |
| 495 2 new obsolescence markers | 495 2 new obsolescence markers |
| 496 (run 'hg heads' to see heads, 'hg merge' to merge) | 496 (run 'hg heads' to see heads, 'hg merge' to merge) |
| 497 2 new content-divergent changesets | 497 2 new divergent changesets |
| 498 | 498 |
| 499 Figure SG09: multiple heads! divergence! oh my! | 499 Figure SG09: multiple heads! divergence! oh my! |
| 500 $ hg --hidden shortlog -G -r 3:: | 500 $ hg --hidden shortlog -G -r 3:: |
| 501 o 7:e3f99ce9d9cd draft fix bug 24 (v2 by alice) | 501 o 7:e3f99ce9d9cd draft fix bug 24 (v2 by alice) |
| 502 | | 502 | |