comparison tests/test-wireproto.t @ 3168:78eb1c1d987b mercurial-4.1

test-compat: merge mercurial-4.2 into mercurial-4.1
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 01 Nov 2017 23:58:27 +0100
parents 3024ae293732
children d1800f4983b5
comparison
equal deleted inserted replaced
3167:f089741039e5 3168:78eb1c1d987b
90 adding manifests 90 adding manifests
91 adding file changes 91 adding file changes
92 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) 92 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
93 obsmarker-exchange: 151 bytes received 93 obsmarker-exchange: 151 bytes received
94 2 new obsolescence markers 94 2 new obsolescence markers
95 (run 'hg heads' to see heads) 95 (run 'hg heads' to see heads, 'hg merge' to merge)
96 $ hg -R ../other pull 96 $ hg -R ../other pull
97 pulling from ssh://user@dummy/server 97 pulling from ssh://user@dummy/server
98 searching for changes 98 searching for changes
99 no changes found 99 no changes found
100 100
145 adding manifests 145 adding manifests
146 adding file changes 146 adding file changes
147 added 1 changesets with 0 changes to 1 files (+1 heads) 147 added 1 changesets with 0 changes to 1 files (+1 heads)
148 obsmarker-exchange: 227 bytes received 148 obsmarker-exchange: 227 bytes received
149 1 new obsolescence markers 149 1 new obsolescence markers
150 (run 'hg heads' to see heads) 150 (run 'hg heads' to see heads, 'hg merge' to merge)
151 151
152 test discovery avoid exchanging known markers 152 test discovery avoid exchanging known markers
153 153
154 $ hg push 154 $ hg push
155 pushing to ssh://user@dummy/server 155 pushing to ssh://user@dummy/server