Mercurial > evolve
comparison tests/test-wireproto.t @ 2594:a3fbe5293bf6 stable
merge with stable
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Fri, 16 Jun 2017 11:32:21 +0200 |
parents | cbc7a69116bd |
children | 54ac473663ff 6e5f5de46c50 |
comparison
equal
deleted
inserted
replaced
2557:e3acb8823900 | 2594:a3fbe5293bf6 |
---|---|
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: 139 bytes received | 75 remote: obsmarker-exchange: 151 bytes received |
76 remote: 2 new obsolescence markers | 76 remote: 2 new obsolescence markers |
77 $ hg push | 77 $ hg push |
78 pushing to ssh://user@dummy/server | 78 pushing to ssh://user@dummy/server |
79 searching for changes | 79 searching for changes |
80 no changes found | 80 no changes found |
88 searching for changes | 88 searching for changes |
89 adding changesets | 89 adding changesets |
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: 139 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) |
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 |
111 searching for changes | 111 searching for changes |
112 remote: adding changesets | 112 remote: adding changesets |
113 remote: adding manifests | 113 remote: adding manifests |
114 remote: adding file changes | 114 remote: adding file changes |
115 remote: added 1 changesets with 1 changes to 1 files | 115 remote: added 1 changesets with 1 changes to 1 files |
116 remote: obsmarker-exchange: 139 bytes received | 116 remote: obsmarker-exchange: 151 bytes received |
117 remote: 2 new obsolescence markers | 117 remote: 2 new obsolescence markers |
118 $ hg -R ../other pull | 118 $ hg -R ../other pull |
119 pulling from ssh://user@dummy/server | 119 pulling from ssh://user@dummy/server |
120 searching for changes | 120 searching for changes |
121 adding changesets | 121 adding changesets |
122 adding manifests | 122 adding manifests |
123 adding file changes | 123 adding file changes |
124 added 1 changesets with 1 changes to 1 files | 124 added 1 changesets with 1 changes to 1 files |
125 obsmarker-exchange: 139 bytes received | 125 obsmarker-exchange: 151 bytes received |
126 2 new obsolescence markers | 126 2 new obsolescence markers |
127 (run 'hg update' to get a working copy) | 127 (run 'hg update' to get a working copy) |
128 | 128 |
129 some common hidden | 129 some common hidden |
130 | 130 |
134 searching for changes | 134 searching for changes |
135 remote: adding changesets | 135 remote: adding changesets |
136 remote: adding manifests | 136 remote: adding manifests |
137 remote: adding file changes | 137 remote: adding file changes |
138 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) |
139 remote: obsmarker-exchange: 208 bytes received | 139 remote: obsmarker-exchange: 227 bytes received |
140 remote: 1 new obsolescence markers | 140 remote: 1 new obsolescence markers |
141 $ hg -R ../other pull | 141 $ hg -R ../other pull |
142 pulling from ssh://user@dummy/server | 142 pulling from ssh://user@dummy/server |
143 searching for changes | 143 searching for changes |
144 adding changesets | 144 adding changesets |
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: 208 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) |
151 | 151 |
152 test discovery avoid exchanging known markers | 152 test discovery avoid exchanging known markers |
153 | 153 |
167 pushing to ssh://user@dummy/server | 167 pushing to ssh://user@dummy/server |
168 searching for changes | 168 searching for changes |
169 (skipping discovery of obsolescence markers, will exchange everything) | 169 (skipping discovery of obsolescence markers, will exchange everything) |
170 (controled by 'experimental.evolution.obsdiscovery' configuration) | 170 (controled by 'experimental.evolution.obsdiscovery' configuration) |
171 no changes found | 171 no changes found |
172 remote: obsmarker-exchange: 346 bytes received | 172 remote: obsmarker-exchange: 377 bytes received |
173 [1] | 173 [1] |
174 $ hg -R ../other pull --config experimental.evolution.obsdiscovery=no | 174 $ hg -R ../other pull --config experimental.evolution.obsdiscovery=no |
175 pulling from ssh://user@dummy/server | 175 pulling from ssh://user@dummy/server |
176 searching for changes | 176 searching for changes |
177 no changes found | 177 no changes found |
178 (skipping discovery of obsolescence markers, will exchange everything) | 178 (skipping discovery of obsolescence markers, will exchange everything) |
179 (controled by 'experimental.evolution.obsdiscovery' configuration) | 179 (controled by 'experimental.evolution.obsdiscovery' configuration) |
180 obsmarker-exchange: 346 bytes received | 180 obsmarker-exchange: 377 bytes received |
181 | 181 |
182 $ cd .. | 182 $ cd .. |