comparison tests/test-obsolete.t @ 1356:aff6bc2a6b2d

test: adapt to change in mercurial core Bundle2 is one by default and more capability have been added.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 04 Jun 2015 13:26:58 -0700
parents a143037892d6
children 6c122c975125
comparison
equal deleted inserted replaced
1355:5b66cff0e470 1356:aff6bc2a6b2d
181 searching for changes 181 searching for changes
182 adding changesets 182 adding changesets
183 adding manifests 183 adding manifests
184 adding file changes 184 adding file changes
185 added 5 changesets with 5 changes to 5 files (+1 heads) 185 added 5 changesets with 5 changes to 5 files (+1 heads)
186 pushing 2 obsolescence markers (* bytes) (glob) 186 2 new obsolescence markers
187 2 obsolescence markers added
188 $ hg -R ../other-new verify 187 $ hg -R ../other-new verify
189 checking changesets 188 checking changesets
190 checking manifests 189 checking manifests
191 crosschecking files in changesets and manifests 190 crosschecking files in changesets and manifests
192 checking files 191 checking files
236 searching for changes 235 searching for changes
237 adding changesets 236 adding changesets
238 adding manifests 237 adding manifests
239 adding file changes 238 adding file changes
240 added 1 changesets with 1 changes to 1 files (+1 heads) 239 added 1 changesets with 1 changes to 1 files (+1 heads)
241 pushing 3 obsolescence markers (* bytes) (glob) 240 1 new obsolescence markers
242 1 obsolescence markers added
243 $ qlog -R ../other-new 241 $ qlog -R ../other-new
244 5 242 5
245 - 95de7fc6918d 243 - 95de7fc6918d
246 3 244 3
247 - 725c380fe99b 245 - 725c380fe99b
259 257
260 $ hg push ../other-new 258 $ hg push ../other-new
261 pushing to ../other-new 259 pushing to ../other-new
262 searching for changes 260 searching for changes
263 no changes found 261 no changes found
264 pushing 3 obsolescence markers (* bytes) (glob)
265 0 obsolescence markers added
266 [1] 262 [1]
267 263
268 $ hg up --hidden -q .^ # 3 264 $ hg up --hidden -q .^ # 3
269 working directory parent is obsolete! 265 working directory parent is obsolete!
270 $ mkcommit "obsol_d'" # 7 266 $ mkcommit "obsol_d'" # 7
276 searching for changes 272 searching for changes
277 adding changesets 273 adding changesets
278 adding manifests 274 adding manifests
279 adding file changes 275 adding file changes
280 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) 276 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
281 pull obsolescence markers 277 1 new obsolescence markers
282 1 obsolescence markers added 278 (run 'hg heads .' to see heads, 'hg merge' to merge)
283 (run 'hg heads' to see heads, 'hg merge' to merge)
284 $ qlog -R ../other-new 279 $ qlog -R ../other-new
285 6 280 6
286 - 909a0fb57e5d 281 - 909a0fb57e5d
287 3 282 3
288 - 725c380fe99b 283 - 725c380fe99b
367 searching for changes 362 searching for changes
368 adding changesets 363 adding changesets
369 adding manifests 364 adding manifests
370 adding file changes 365 adding file changes
371 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) 366 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
372 pull obsolescence markers 367 1 new obsolescence markers
373 1 obsolescence markers added 368 (run 'hg heads .' to see heads, 'hg merge' to merge)
374 (run 'hg heads' to see heads, 'hg merge' to merge)
375 369
376 $ hg up -q 7 # to check rollback update behavior 370 $ hg up -q 7 # to check rollback update behavior
377 $ qlog 371 $ qlog
378 7 372 7
379 - 159dfc9fa5d3 373 - 159dfc9fa5d3
542 searching for changes 536 searching for changes
543 adding changesets 537 adding changesets
544 adding manifests 538 adding manifests
545 adding file changes 539 adding file changes
546 added 2 changesets with 1 changes to [12] files (re) 540 added 2 changesets with 1 changes to [12] files (re)
547 pushing 7 obsolescence markers (* bytes) (glob) 541 3 new obsolescence markers
548 3 obsolescence markers added
549 $ hg up -q 10 542 $ hg up -q 10
550 $ mkcommit "obsol_d'''" 543 $ mkcommit "obsol_d'''"
551 created new head 544 created new head
552 $ hg debugobsolete `getid 11` `getid 12` 545 $ hg debugobsolete `getid 11` `getid 12`
553 $ hg push ../other-new --traceback 546 $ hg push ../other-new --traceback
555 searching for changes 548 searching for changes
556 adding changesets 549 adding changesets
557 adding manifests 550 adding manifests
558 adding file changes 551 adding file changes
559 added 1 changesets with 1 changes to 1 files (+1 heads) 552 added 1 changesets with 1 changes to 1 files (+1 heads)
560 pushing 8 obsolescence markers (* bytes) (glob) 553 1 new obsolescence markers
561 1 obsolescence markers added
562 $ cd .. 554 $ cd ..
563 555
564 check bumped detection 556 check bumped detection
565 (make an obsolete changeset public) 557 (make an obsolete changeset public)
566 558