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: 151 bytes received |
75 remote: obsmarker-exchange: 151 bytes received |
76 remote: 2 new obsolescence markers |
76 remote: 2 new obsolescence markers |
77 remote: obsoleted 1 changesets |
|
78 $ hg push |
77 $ hg push |
79 pushing to ssh://user@dummy/server |
78 pushing to ssh://user@dummy/server |
80 searching for changes |
79 searching for changes |
81 no changes found |
80 no changes found |
82 [1] |
81 [1] |
91 adding manifests |
90 adding manifests |
92 adding file changes |
91 adding file changes |
93 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) |
94 obsmarker-exchange: 151 bytes received |
93 obsmarker-exchange: 151 bytes received |
95 2 new obsolescence markers |
94 2 new obsolescence markers |
96 obsoleted 1 changesets |
|
97 (run 'hg heads' to see heads) |
95 (run 'hg heads' to see heads) |
98 $ hg -R ../other pull |
96 $ hg -R ../other pull |
99 pulling from ssh://user@dummy/server |
97 pulling from ssh://user@dummy/server |
100 searching for changes |
98 searching for changes |
101 no changes found |
99 no changes found |
136 searching for changes |
134 searching for changes |
137 remote: adding changesets |
135 remote: adding changesets |
138 remote: adding manifests |
136 remote: adding manifests |
139 remote: adding file changes |
137 remote: adding file changes |
140 remote: added 1 changesets with 0 changes to 1 files (+1 heads) |
138 remote: added 1 changesets with 0 changes to 1 files (+1 heads) |
141 remote: obsmarker-exchange: 226 bytes received |
139 remote: obsmarker-exchange: 227 bytes received |
142 remote: 1 new obsolescence markers |
140 remote: 1 new obsolescence markers |
143 remote: obsoleted 1 changesets |
|
144 $ hg -R ../other pull |
141 $ hg -R ../other pull |
145 pulling from ssh://user@dummy/server |
142 pulling from ssh://user@dummy/server |
146 searching for changes |
143 searching for changes |
147 adding changesets |
144 adding changesets |
148 adding manifests |
145 adding manifests |
149 adding file changes |
146 adding file changes |
150 added 1 changesets with 0 changes to 1 files (+1 heads) |
147 added 1 changesets with 0 changes to 1 files (+1 heads) |
151 obsmarker-exchange: 226 bytes received |
148 obsmarker-exchange: 227 bytes received |
152 1 new obsolescence markers |
149 1 new obsolescence markers |
153 obsoleted 1 changesets |
|
154 (run 'hg heads' to see heads) |
150 (run 'hg heads' to see heads) |
155 |
151 |
156 test discovery avoid exchanging known markers |
152 test discovery avoid exchanging known markers |
157 |
153 |
158 $ hg push |
154 $ hg push |
171 pushing to ssh://user@dummy/server |
167 pushing to ssh://user@dummy/server |
172 searching for changes |
168 searching for changes |
173 (skipping discovery of obsolescence markers, will exchange everything) |
169 (skipping discovery of obsolescence markers, will exchange everything) |
174 (controled by 'experimental.evolution.obsdiscovery' configuration) |
170 (controled by 'experimental.evolution.obsdiscovery' configuration) |
175 no changes found |
171 no changes found |
176 remote: obsmarker-exchange: 376 bytes received |
172 remote: obsmarker-exchange: 377 bytes received |
177 [1] |
173 [1] |
178 $ hg -R ../other pull --config experimental.evolution.obsdiscovery=no |
174 $ hg -R ../other pull --config experimental.evolution.obsdiscovery=no |
179 pulling from ssh://user@dummy/server |
175 pulling from ssh://user@dummy/server |
180 searching for changes |
176 searching for changes |
181 no changes found |
177 no changes found |
182 (skipping discovery of obsolescence markers, will exchange everything) |
178 (skipping discovery of obsolescence markers, will exchange everything) |
183 (controled by 'experimental.evolution.obsdiscovery' configuration) |
179 (controled by 'experimental.evolution.obsdiscovery' configuration) |
184 obsmarker-exchange: 376 bytes received |
180 obsmarker-exchange: 377 bytes received |
185 |
181 |
186 $ cd .. |
182 $ cd .. |
187 |
183 |
188 And disable it server side too: |
184 And disable it server side too: |
189 |
185 |
208 |
204 |
209 $ hg -R client pull http://localhost:$HGPORT/ |
205 $ hg -R client pull http://localhost:$HGPORT/ |
210 pulling from http://localhost:$HGPORT/ |
206 pulling from http://localhost:$HGPORT/ |
211 searching for changes |
207 searching for changes |
212 no changes found |
208 no changes found |
213 obsmarker-exchange: 376 bytes received |
209 obsmarker-exchange: 377 bytes received |
214 |
210 |
215 $ hg -R client pull http://localhost:$HGPORT/ --config experimental.evolution=createmarkers |
211 $ hg -R client pull http://localhost:$HGPORT/ --config experimental.evolution=createmarkers |
216 pulling from http://localhost:$HGPORT/ |
212 pulling from http://localhost:$HGPORT/ |
217 searching for changes |
213 searching for changes |
218 no changes found |
214 no changes found |