Mercurial > evolve
comparison tests/test-topic-tutorial.t @ 3075:8feb2cae7eae
test: adapt to output change from eb586ed5d8ce
Core have a more verbose output on pull. We have to update tests with it.
CORE-TEST-OUTPUT-UPDATE: eb586ed5d8ce
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 17 Oct 2017 17:12:38 +0200 |
| parents | f43a310c4338 |
| children | e91ca8b5ecf7 |
comparison
equal
deleted
inserted
replaced
| 3074:8d57acde165d | 3075:8feb2cae7eae |
|---|---|
| 378 searching for changes | 378 searching for changes |
| 379 adding changesets | 379 adding changesets |
| 380 adding manifests | 380 adding manifests |
| 381 adding file changes | 381 adding file changes |
| 382 added 1 changesets with 1 changes to 1 files (+1 heads) | 382 added 1 changesets with 1 changes to 1 files (+1 heads) |
| 383 new changesets 6104862e8b84 | |
| 383 (run 'hg heads' to see heads) | 384 (run 'hg heads' to see heads) |
| 384 | 385 |
| 385 $ hg log -G | 386 $ hg log -G |
| 386 o changeset: 3:6104862e8b84 | 387 o changeset: 3:6104862e8b84 |
| 387 | tag: tip | 388 | tag: tip |
| 819 searching for changes | 820 searching for changes |
| 820 adding changesets | 821 adding changesets |
| 821 adding manifests | 822 adding manifests |
| 822 adding file changes | 823 adding file changes |
| 823 added 2 changesets with 2 changes to 1 files (+1 heads) | 824 added 2 changesets with 2 changes to 1 files (+1 heads) |
| 825 new changesets f2d6cacc6115:fbff9bc37a43 | |
| 824 (run 'hg heads' to see heads) | 826 (run 'hg heads' to see heads) |
| 825 | 827 |
| 826 There are new changes! We can simply use ``hg rebase`` to update our | 828 There are new changes! We can simply use ``hg rebase`` to update our |
| 827 changeset on top of the latest: | 829 changeset on top of the latest: |
| 828 | 830 |
| 1822 adding changesets | 1824 adding changesets |
| 1823 adding manifests | 1825 adding manifests |
| 1824 adding file changes | 1826 adding file changes |
| 1825 added 4 changesets with 4 changes to 1 files (+1 heads) | 1827 added 4 changesets with 4 changes to 1 files (+1 heads) |
| 1826 8 new obsolescence markers | 1828 8 new obsolescence markers |
| 1829 new changesets b7509bd417f8:2d084ac00115 | |
| 1827 (run 'hg heads' to see heads) | 1830 (run 'hg heads' to see heads) |
| 1828 | 1831 |
| 1829 $ hg topics --verbose | 1832 $ hg topics --verbose |
| 1830 tools (on branch: default, 4 changesets, 2 behind) | 1833 tools (on branch: default, 4 changesets, 2 behind) |
| 1831 | 1834 |
| 1865 searching for changes | 1868 searching for changes |
| 1866 adding changesets | 1869 adding changesets |
| 1867 adding manifests | 1870 adding manifests |
| 1868 adding file changes | 1871 adding file changes |
| 1869 added 1 changesets with 1 changes to 1 files | 1872 added 1 changesets with 1 changes to 1 files |
| 1873 new changesets 0d409663a1fd | |
| 1870 (run 'hg update' to get a working copy) | 1874 (run 'hg update' to get a working copy) |
| 1871 | 1875 |
| 1872 $ hg update | 1876 $ hg update |
| 1873 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1877 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 1874 | 1878 |