Mercurial > evolve
comparison tests/test-sharing.t @ 4568:0cc913ea542d mercurial-4.7
test-compat: merge mercurial-4.8 into mercurial-4.7
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 23 Apr 2019 14:18:08 +0200 |
| parents | 7a779a288793 |
| children | f54bb6eaf5e6 653c42af172e |
comparison
equal
deleted
inserted
replaced
| 4567:d548830ed30d | 4568:0cc913ea542d |
|---|---|
| 86 adding manifests | 86 adding manifests |
| 87 adding file changes | 87 adding file changes |
| 88 added 1 changesets with 1 changes to 1 files (+1 heads) | 88 added 1 changesets with 1 changes to 1 files (+1 heads) |
| 89 1 new obsolescence markers | 89 1 new obsolescence markers |
| 90 obsoleted 1 changesets | 90 obsoleted 1 changesets |
| 91 new changesets 60ffde5765c5 (1 drafts) | 91 new changesets 60ffde5765c5 |
| 92 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 92 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 93 updated to "60ffde5765c5: fix bug 37" | 93 updated to "60ffde5765c5: fix bug 37" |
| 94 1 other heads for branch "default" | 94 1 other heads for branch "default" |
| 95 | 95 |
| 96 Figure SG03 | 96 Figure SG03 |
| 455 searching for changes | 455 searching for changes |
| 456 adding changesets | 456 adding changesets |
| 457 adding manifests | 457 adding manifests |
| 458 adding file changes | 458 adding file changes |
| 459 added 1 changesets with 1 changes to 1 files | 459 added 1 changesets with 1 changes to 1 files |
| 460 new changesets 2fe6c4bd32d0 (1 drafts) | 460 new changesets 2fe6c4bd32d0 |
| 461 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 461 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 462 $ echo 'better fix (alice)' >> file1 | 462 $ echo 'better fix (alice)' >> file1 |
| 463 $ hg amend -u alice -m 'fix bug 24 (v2 by alice)' | 463 $ hg amend -u alice -m 'fix bug 24 (v2 by alice)' |
| 464 | 464 |
| 465 Bob implements a better fix of his own:: | 465 Bob implements a better fix of his own:: |
| 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 | 488 2 new content-divergent changesets |
| 489 new changesets e3f99ce9d9cd (1 drafts) | 489 new changesets e3f99ce9d9cd |
| 490 (run 'hg heads' to see heads, 'hg merge' to merge) | 490 (run 'hg heads' to see heads, 'hg merge' to merge) |
| 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 * 6:e3f99ce9d9cd draft fix bug 24 (v2 by alice) |