comparison tests/test-wireproto.t @ 3105:f5d472b7e800 mercurial-4.3

test-compat: revert output changes related to temporary amend commit This backed out changeset 06844693bb21 and other related changes.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 20 Oct 2017 19:32:18 +0200
parents 13cafb250c1a
children 9c9c8c1eeb93 1b58e0121689
comparison
equal deleted inserted replaced
3104:3dd5a6f83f8b 3105:f5d472b7e800
70 searching for changes 70 searching for changes
71 remote: adding changesets 71 remote: adding changesets
72 remote: adding manifests 72 remote: adding manifests
73 remote: adding file changes 73 remote: adding file changes
74 remote: added 1 changesets with 1 changes to 1 files (+1 heads) 74 remote: added 1 changesets with 1 changes to 1 files (+1 heads)
75 remote: obsmarker-exchange: 76 bytes received 75 remote: obsmarker-exchange: 151 bytes received
76 remote: 1 new obsolescence markers 76 remote: 2 new obsolescence markers
77 remote: obsoleted 1 changesets 77 remote: obsoleted 1 changesets
78 $ hg push 78 $ hg push
79 pushing to ssh://user@dummy/server 79 pushing to ssh://user@dummy/server
80 searching for changes 80 searching for changes
81 no changes found 81 no changes found
89 searching for changes 89 searching for changes
90 adding changesets 90 adding changesets
91 adding manifests 91 adding manifests
92 adding file changes 92 adding file changes
93 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) 93 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
94 obsmarker-exchange: 76 bytes received 94 obsmarker-exchange: 151 bytes received
95 1 new obsolescence markers 95 2 new obsolescence markers
96 obsoleted 1 changesets 96 obsoleted 1 changesets
97 (run 'hg heads' to see heads) 97 (run 'hg heads' to see heads)
98 $ hg -R ../other pull 98 $ hg -R ../other pull
99 pulling from ssh://user@dummy/server 99 pulling from ssh://user@dummy/server
100 searching for changes 100 searching for changes
113 searching for changes 113 searching for changes
114 remote: adding changesets 114 remote: adding changesets
115 remote: adding manifests 115 remote: adding manifests
116 remote: adding file changes 116 remote: adding file changes
117 remote: added 1 changesets with 1 changes to 1 files 117 remote: added 1 changesets with 1 changes to 1 files
118 remote: obsmarker-exchange: 76 bytes received 118 remote: obsmarker-exchange: 151 bytes received
119 remote: 1 new obsolescence markers 119 remote: 2 new obsolescence markers
120 $ hg -R ../other pull 120 $ hg -R ../other pull
121 pulling from ssh://user@dummy/server 121 pulling from ssh://user@dummy/server
122 searching for changes 122 searching for changes
123 adding changesets 123 adding changesets
124 adding manifests 124 adding manifests
125 adding file changes 125 adding file changes
126 added 1 changesets with 1 changes to 1 files 126 added 1 changesets with 1 changes to 1 files
127 obsmarker-exchange: 76 bytes received 127 obsmarker-exchange: 151 bytes received
128 1 new obsolescence markers 128 2 new obsolescence markers
129 (run 'hg update' to get a working copy) 129 (run 'hg update' to get a working copy)
130 130
131 some common hidden 131 some common hidden
132 132
133 $ hg touch . 133 $ hg touch .
136 searching for changes 136 searching for changes
137 remote: adding changesets 137 remote: adding changesets
138 remote: adding manifests 138 remote: adding manifests
139 remote: adding file changes 139 remote: adding file changes
140 remote: added 1 changesets with 0 changes to 1 files (+1 heads) 140 remote: added 1 changesets with 0 changes to 1 files (+1 heads)
141 remote: obsmarker-exchange: 151 bytes received 141 remote: obsmarker-exchange: 226 bytes received
142 remote: 1 new obsolescence markers 142 remote: 1 new obsolescence markers
143 remote: obsoleted 1 changesets 143 remote: obsoleted 1 changesets
144 $ hg -R ../other pull 144 $ hg -R ../other pull
145 pulling from ssh://user@dummy/server 145 pulling from ssh://user@dummy/server
146 searching for changes 146 searching for changes
147 adding changesets 147 adding changesets
148 adding manifests 148 adding manifests
149 adding file changes 149 adding file changes
150 added 1 changesets with 0 changes to 1 files (+1 heads) 150 added 1 changesets with 0 changes to 1 files (+1 heads)
151 obsmarker-exchange: 151 bytes received 151 obsmarker-exchange: 226 bytes received
152 1 new obsolescence markers 152 1 new obsolescence markers
153 obsoleted 1 changesets 153 obsoleted 1 changesets
154 (run 'hg heads' to see heads) 154 (run 'hg heads' to see heads)
155 155
156 test discovery avoid exchanging known markers 156 test discovery avoid exchanging known markers
171 pushing to ssh://user@dummy/server 171 pushing to ssh://user@dummy/server
172 searching for changes 172 searching for changes
173 (skipping discovery of obsolescence markers, will exchange everything) 173 (skipping discovery of obsolescence markers, will exchange everything)
174 (controled by 'experimental.evolution.obsdiscovery' configuration) 174 (controled by 'experimental.evolution.obsdiscovery' configuration)
175 no changes found 175 no changes found
176 remote: obsmarker-exchange: 226 bytes received 176 remote: obsmarker-exchange: 376 bytes received
177 [1] 177 [1]
178 $ hg -R ../other pull --config experimental.evolution.obsdiscovery=no 178 $ hg -R ../other pull --config experimental.evolution.obsdiscovery=no
179 pulling from ssh://user@dummy/server 179 pulling from ssh://user@dummy/server
180 searching for changes 180 searching for changes
181 no changes found 181 no changes found
182 (skipping discovery of obsolescence markers, will exchange everything) 182 (skipping discovery of obsolescence markers, will exchange everything)
183 (controled by 'experimental.evolution.obsdiscovery' configuration) 183 (controled by 'experimental.evolution.obsdiscovery' configuration)
184 obsmarker-exchange: 226 bytes received 184 obsmarker-exchange: 376 bytes received
185 185
186 $ cd .. 186 $ cd ..