Mercurial > evolve

comparison tests/test-sharing.t @ 3930:d00f0c369bc7 mercurial-4.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 f9dad99a90d5
children 537fd9a86c06 e268f7fd7839
comparison
equal deleted inserted replaced
3929:e709e3817d7e 3930:d00f0c369bc7
483 adding changesets 483 adding changesets
484 adding manifests 484 adding manifests
485 adding file changes 485 adding file changes
486 added 1 changesets with 1 changes to 1 files (+1 heads) 486 added 1 changesets with 1 changes to 1 files (+1 heads)
487 1 new obsolescence markers 487 1 new obsolescence markers
488 2 new content-divergent changesets
489 new changesets e3f99ce9d9cd 488 new changesets e3f99ce9d9cd
490 (run 'hg heads' to see heads, 'hg merge' to merge) 489 (run 'hg heads' to see heads, 'hg merge' to merge)
490 2 new content-divergent changesets
491 491
492 Figure SG09: multiple heads! divergence! oh my! 492 Figure SG09: multiple heads! divergence! oh my!
493 $ hg --hidden shortlog -G -r 3:: 493 $ hg --hidden shortlog -G -r 3::
494 * 6:e3f99ce9d9cd draft fix bug 24 (v2 by alice) 494 o 6:e3f99ce9d9cd draft fix bug 24 (v2 by alice)
495 | 495 |
496 | @ 5:a360947f6faf draft fix bug 24 (v2 by bob) 496 | @ 5:a360947f6faf draft fix bug 24 (v2 by bob)
497 |/ 497 |/
498 | x 4:2fe6c4bd32d0 draft fix bug 24 (v1) 498 | x 4:2fe6c4bd32d0 draft fix bug 24 (v1)
499 |/ 499 |/