Mercurial > evolve

comparison tests/test-sharing.t @ 5766:82da27321e91 mercurial-4.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.8 into mercurial-4.7 # no-check-commit
author Anton Shestakov <av6@dwimlabs.net>
date Sun, 31 Jan 2021 16:15:26 +0800
parents 011b53a9d03c 08c30eef85d3
children 55e9987b8384
comparison
equal deleted inserted replaced
5765:98e87c181e0f 5766:82da27321e91
100 adding manifests 100 adding manifests
101 adding file changes 101 adding file changes
102 added 1 changesets with 1 changes to 1 files (+1 heads) 102 added 1 changesets with 1 changes to 1 files (+1 heads)
103 2 new obsolescence markers 103 2 new obsolescence markers
104 obsoleted 1 changesets 104 obsoleted 1 changesets
105 new changesets 522d503432a2 (1 drafts) 105 new changesets 522d503432a2
106 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 106 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
107 updated to "522d503432a2: fix bug 37" 107 updated to "522d503432a2: fix bug 37"
108 1 other heads for branch "default" 108 1 other heads for branch "default"
109 109
110 Figure SG03 110 Figure SG03
458 searching for changes 458 searching for changes
459 adding changesets 459 adding changesets
460 adding manifests 460 adding manifests
461 adding file changes 461 adding file changes
462 added 1 changesets with 1 changes to 1 files 462 added 1 changesets with 1 changes to 1 files
463 new changesets b2be254b3b9f (1 drafts) 463 new changesets b2be254b3b9f
464 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 464 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
465 $ echo 'better fix (alice)' >> file1 465 $ echo 'better fix (alice)' >> file1
466 $ hg amend -u alice -m 'fix bug 24 (v2 by alice)' 466 $ hg amend -u alice -m 'fix bug 24 (v2 by alice)'
467 467
468 Bob implements a better fix of his own:: 468 Bob implements a better fix of his own::
487 adding manifests 487 adding manifests
488 adding file changes 488 adding file changes
489 added 1 changesets with 1 changes to 1 files (+1 heads) 489 added 1 changesets with 1 changes to 1 files (+1 heads)
490 1 new obsolescence markers 490 1 new obsolescence markers
491 2 new content-divergent changesets 491 2 new content-divergent changesets
492 new changesets e3a586fd2377 (1 drafts) 492 new changesets e3a586fd2377
493 (run 'hg heads' to see heads, 'hg merge' to merge) 493 (run 'hg heads' to see heads, 'hg merge' to merge)
494 494
495 Figure SG09: multiple heads! divergence! oh my! 495 Figure SG09: multiple heads! divergence! oh my!
496 $ hg --hidden shortlog -G -r 3:: 496 $ hg --hidden shortlog -G -r 3::
497 * 6:e3a5 draft fix bug 24 (v2 by alice) 497 * 6:e3a5 draft fix bug 24 (v2 by alice)