Mercurial > evolve
diff tests/test-wireproto.t @ 2798:2280461343e5 mercurial-4.2
test-compat: merge mercurial-4.2 with the new stable branch content
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 25 Jul 2017 03:41:15 +0200 |
| parents | e22de367fc74 |
| children | 1627153804dc 67b59d1657cf |
line wrap: on
line diff
--- a/tests/test-wireproto.t Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-wireproto.t Tue Jul 25 03:41:15 2017 +0200 @@ -74,7 +74,6 @@ remote: added 1 changesets with 1 changes to 1 files (+1 heads) remote: obsmarker-exchange: 151 bytes received remote: 2 new obsolescence markers - remote: obsoleted 1 changesets $ hg push pushing to ssh://user@dummy/server searching for changes @@ -93,7 +92,6 @@ added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) obsmarker-exchange: 151 bytes received 2 new obsolescence markers - obsoleted 1 changesets (run 'hg heads' to see heads) $ hg -R ../other pull pulling from ssh://user@dummy/server @@ -138,9 +136,8 @@ remote: adding manifests remote: adding file changes remote: added 1 changesets with 0 changes to 1 files (+1 heads) - remote: obsmarker-exchange: 226 bytes received + remote: obsmarker-exchange: 227 bytes received remote: 1 new obsolescence markers - remote: obsoleted 1 changesets $ hg -R ../other pull pulling from ssh://user@dummy/server searching for changes @@ -148,9 +145,8 @@ adding manifests adding file changes added 1 changesets with 0 changes to 1 files (+1 heads) - obsmarker-exchange: 226 bytes received + obsmarker-exchange: 227 bytes received 1 new obsolescence markers - obsoleted 1 changesets (run 'hg heads' to see heads) test discovery avoid exchanging known markers @@ -173,7 +169,7 @@ (skipping discovery of obsolescence markers, will exchange everything) (controled by 'experimental.evolution.obsdiscovery' configuration) no changes found - remote: obsmarker-exchange: 376 bytes received + remote: obsmarker-exchange: 377 bytes received [1] $ hg -R ../other pull --config experimental.evolution.obsdiscovery=no pulling from ssh://user@dummy/server @@ -181,6 +177,6 @@ no changes found (skipping discovery of obsolescence markers, will exchange everything) (controled by 'experimental.evolution.obsdiscovery' configuration) - obsmarker-exchange: 376 bytes received + obsmarker-exchange: 377 bytes received $ cd ..