Mercurial > evolve
comparison tests/test-topic-tutorial.t @ 3442:7ac98f83ae6d mercurial-4.1
test-compat: merge mercurial-4.2 into mercurial-4.1
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Sat, 20 Jan 2018 12:38:11 +0100 |
parents | b21a3753255f fc2dd881297b |
children | b92114f201c9 |
comparison
equal
deleted
inserted
replaced
3441:fc2dd881297b | 3442:7ac98f83ae6d |
---|---|
1810 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1810 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1811 | 1811 |
1812 $ cd client | 1812 $ cd client |
1813 | 1813 |
1814 We can now share these draft changesets: | 1814 We can now share these draft changesets: |
1815 | 1815 (4.1-tests needs the --force to proceed with the test) |
1816 $ hg push ../non-publishing-server -r tools | 1816 |
1817 $ hg push ../non-publishing-server -r tools --force | |
1817 pushing to ../non-publishing-server | 1818 pushing to ../non-publishing-server |
1818 searching for changes | 1819 searching for changes |
1819 adding changesets | 1820 adding changesets |
1820 adding manifests | 1821 adding manifests |
1821 adding file changes | 1822 adding file changes |
1855 t2: Adding nails | 1856 t2: Adding nails |
1856 t1: Adding hammer to the shopping list | 1857 t1: Adding hammer to the shopping list |
1857 t0^ add a pair of shoes (base) | 1858 t0^ add a pair of shoes (base) |
1858 | 1859 |
1859 We can also add new changesets and share them: | 1860 We can also add new changesets and share them: |
1861 (4.1-tests needs the --force to proceed with the test) | |
1860 | 1862 |
1861 $ echo screws >> shopping | 1863 $ echo screws >> shopping |
1862 | 1864 |
1863 $ hg commit -A -m "Adding screws" | 1865 $ hg commit -A -m "Adding screws" |
1864 | 1866 |
1865 $ hg push ../non-publishing-server | 1867 $ hg push ../non-publishing-server --force |
1866 pushing to ../non-publishing-server | 1868 pushing to ../non-publishing-server |
1867 searching for changes | 1869 searching for changes |
1868 adding changesets | 1870 adding changesets |
1869 adding manifests | 1871 adding manifests |
1870 adding file changes | 1872 adding file changes |