Mercurial > evolve
comparison tests/test-evolve.t @ 1800:1554b30b18eb mercurial-3.4
merge with 5.6.0
no extra changes were needed from the mercurial-3.5 branch.
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Wed, 01 Feb 2017 16:03:39 +0100 |
| parents | 6d54fd20bb81 b1809340478b |
| children |
comparison
equal
deleted
inserted
replaced
| 1799:b1809340478b | 1800:1554b30b18eb |
|---|---|
| 473 $ hg clone -Ur 0 alpha beta | 473 $ hg clone -Ur 0 alpha beta |
| 474 adding changesets | 474 adding changesets |
| 475 adding manifests | 475 adding manifests |
| 476 adding file changes | 476 adding file changes |
| 477 added 1 changesets with 1 changes to 1 files | 477 added 1 changesets with 1 changes to 1 files |
| 478 pull obsolescence markers | |
| 478 $ cd alpha | 479 $ cd alpha |
| 479 | 480 |
| 480 $ cat << EOF > A | 481 $ cat << EOF > A |
| 481 > We | 482 > We |
| 482 > need | 483 > need |
| 529 searching for changes | 530 searching for changes |
| 530 adding changesets | 531 adding changesets |
| 531 adding manifests | 532 adding manifests |
| 532 adding file changes | 533 adding file changes |
| 533 added 1 changesets with 1 changes to 1 files | 534 added 1 changesets with 1 changes to 1 files |
| 534 2 new obsolescence markers | 535 pull obsolescence markers |
| 536 2 obsolescence markers added | |
| 535 (run 'hg update' to get a working copy) | 537 (run 'hg update' to get a working copy) |
| 536 $ hg up | 538 $ hg up |
| 537 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 539 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 538 | 540 |
| 539 $ cd .. | 541 $ cd .. |