comparison tests/test-discovery-obshashrange.t @ 3914:96945ea908df stable

branching: merge default into stable The stable branch of Mercurial core now contains Mercurial 4.7 so evolve branch policy requires this merge. The @ bookmark is in the right location, so people doing clone will get to the latest release.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 31 Jul 2018 12:52:06 +0200
parents a93e81733549
children 89e4184b26ba beb6a77223d2 a7794f5abacd
comparison
equal deleted inserted replaced
3901:f2b8429db565 3914:96945ea908df
174 $ echo foo > foo 174 $ echo foo > foo
175 $ hg add foo 175 $ hg add foo
176 $ hg commit -m foo 176 $ hg commit -m foo
177 $ hg debugobsolete ffffffffffffffffffffffffffffffffffffffff `getid '.'` 177 $ hg debugobsolete ffffffffffffffffffffffffffffffffffffffff `getid '.'`
178 $ hg push -f --debug 178 $ hg push -f --debug
179 could not import hgext.hgext3rd.evolve (No module named hgext3rd.evolve): trying hgext3rd.hgext3rd.evolve (?)
180 could not import hgext3rd.hgext3rd.evolve (No module named hgext3rd.evolve): trying hgext3rd.evolve (?)
179 pushing to ssh://user@dummy/server 181 pushing to ssh://user@dummy/server
180 running python "*/dummyssh" *user@dummy* *hg -R server serve --stdio* (glob) 182 running python "*/dummyssh" *user@dummy* *hg -R server serve --stdio* (glob)
181 sending hello command 183 sending hello command
182 sending between command 184 sending between command
183 remote: * (glob) 185 remote: * (glob)
222 bundle2-output-part: "obsmarkers" streamed payload 224 bundle2-output-part: "obsmarkers" streamed payload
223 remote: adding changesets 225 remote: adding changesets
224 remote: adding manifests 226 remote: adding manifests
225 remote: adding file changes 227 remote: adding file changes
226 remote: added 1 changesets with 1 changes to 1 files (+1 heads) 228 remote: added 1 changesets with 1 changes to 1 files (+1 heads)
227 remote: 1 new obsolescence markers
228 bundle2-input-bundle: no-transaction 229 bundle2-input-bundle: no-transaction
229 bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported 230 bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
230 bundle2-input-part: "reply:obsmarkers" (params: 0 advisory) supported 231 bundle2-input-part: "reply:obsmarkers" (params: 0 advisory) supported
231 bundle2-input-bundle: 1 parts total 232 bundle2-input-bundle: 1 parts total
232 preparing listkeys for "phases" 233 preparing listkeys for "phases"
233 sending listkeys command 234 sending listkeys command
234 received listkey for "phases": 58 bytes 235 received listkey for "phases": 58 bytes
236 remote: 1 new obsolescence markers
235 $ hg -R ../server blackbox 237 $ hg -R ../server blackbox
236 * @0000000000000000000000000000000000000000 (*)> -R server serve --stdio (glob) 238 * @0000000000000000000000000000000000000000 (*)> -R server serve --stdio (glob)
237 * @0000000000000000000000000000000000000000 (*)> strip detected, evo-ext-stablerange-mergepoint cache reset (glob) 239 * @0000000000000000000000000000000000000000 (*)> strip detected, evo-ext-stablerange-mergepoint cache reset (glob)
238 * @0000000000000000000000000000000000000000 (*)> strip detected, evo-ext-depthcache cache reset (glob) 240 * @0000000000000000000000000000000000000000 (*)> strip detected, evo-ext-depthcache cache reset (glob)
239 * @0000000000000000000000000000000000000000 (*)> updated evo-ext-depthcache in *.???? seconds (8r) (glob) 241 * @0000000000000000000000000000000000000000 (*)> updated evo-ext-depthcache in *.???? seconds (8r) (glob)