Mercurial > evolve
comparison tests/test-stablesort.t @ 3287:4303a46b4167 mercurial-4.3
test-compat: merge stable into mercurial-4.3
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Mon, 11 Dec 2017 16:32:03 +0100 |
parents | ccfcacc5ee7c 07678f7a4481 |
children | 85cdce113c2c |
comparison
equal
deleted
inserted
replaced
3286:76c447d88d9a | 3287:4303a46b4167 |
---|---|
233 $ hg clone repo_A repo_B --rev 5 | 233 $ hg clone repo_A repo_B --rev 5 |
234 adding changesets | 234 adding changesets |
235 adding manifests | 235 adding manifests |
236 adding file changes | 236 adding file changes |
237 added 4 changesets with 0 changes to 0 files | 237 added 4 changesets with 0 changes to 0 files |
238 new changesets 1ea73414a91b:f0f3ef9a6cd5 | |
239 updating to branch default | 238 updating to branch default |
240 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 239 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
241 $ hg -R repo_B pull --rev 13 | 240 $ hg -R repo_B pull --rev 13 |
242 pulling from $TESTTMP/repo_A (glob) | 241 pulling from $TESTTMP/repo_A (glob) |
243 searching for changes | 242 searching for changes |
244 adding changesets | 243 adding changesets |
245 adding manifests | 244 adding manifests |
246 adding file changes | 245 adding file changes |
247 added 4 changesets with 0 changes to 0 files (+1 heads) | 246 added 4 changesets with 0 changes to 0 files (+1 heads) |
248 new changesets 66f7d451a68b:b4594d867745 | |
249 (run 'hg heads' to see heads, 'hg merge' to merge) | 247 (run 'hg heads' to see heads, 'hg merge' to merge) |
250 $ hg -R repo_B pull --rev 14 | 248 $ hg -R repo_B pull --rev 14 |
251 pulling from $TESTTMP/repo_A (glob) | 249 pulling from $TESTTMP/repo_A (glob) |
252 searching for changes | 250 searching for changes |
253 adding changesets | 251 adding changesets |
254 adding manifests | 252 adding manifests |
255 adding file changes | 253 adding file changes |
256 added 1 changesets with 0 changes to 0 files (+1 heads) | 254 added 1 changesets with 0 changes to 0 files (+1 heads) |
257 new changesets 43227190fef8 | |
258 (run 'hg heads .' to see heads, 'hg merge' to merge) | 255 (run 'hg heads .' to see heads, 'hg merge' to merge) |
259 $ hg -R repo_B pull | 256 $ hg -R repo_B pull |
260 pulling from $TESTTMP/repo_A (glob) | 257 pulling from $TESTTMP/repo_A (glob) |
261 searching for changes | 258 searching for changes |
262 adding changesets | 259 adding changesets |
263 adding manifests | 260 adding manifests |
264 adding file changes | 261 adding file changes |
265 added 7 changesets with 0 changes to 0 files (+3 heads) | 262 added 7 changesets with 0 changes to 0 files (+3 heads) |
266 new changesets 2702dd0c91e7:1d8d22637c2d | |
267 (run 'hg heads .' to see heads, 'hg merge' to merge) | 263 (run 'hg heads .' to see heads, 'hg merge' to merge) |
268 $ hg -R repo_B log -G | 264 $ hg -R repo_B log -G |
269 o 15 1d8d22637c2d r15 tip | 265 o 15 1d8d22637c2d r15 tip |
270 |\ | 266 |\ |
271 | | o 14 e46a4836065c r12 | 267 | | o 14 e46a4836065c r12 |
320 $ hg clone repo_A repo_C --rev 10 | 316 $ hg clone repo_A repo_C --rev 10 |
321 adding changesets | 317 adding changesets |
322 adding manifests | 318 adding manifests |
323 adding file changes | 319 adding file changes |
324 added 7 changesets with 0 changes to 0 files | 320 added 7 changesets with 0 changes to 0 files |
325 new changesets 1ea73414a91b:ff43616e5d0f | |
326 updating to branch default | 321 updating to branch default |
327 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 322 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
328 $ hg -R repo_C pull --rev 12 | 323 $ hg -R repo_C pull --rev 12 |
329 pulling from $TESTTMP/repo_A (glob) | 324 pulling from $TESTTMP/repo_A (glob) |
330 searching for changes | 325 searching for changes |
331 adding changesets | 326 adding changesets |
332 adding manifests | 327 adding manifests |
333 adding file changes | 328 adding file changes |
334 added 2 changesets with 0 changes to 0 files (+1 heads) | 329 added 2 changesets with 0 changes to 0 files (+1 heads) |
335 new changesets bab5d5bf48bd:e46a4836065c | |
336 (run 'hg heads' to see heads, 'hg merge' to merge) | 330 (run 'hg heads' to see heads, 'hg merge' to merge) |
337 $ hg -R repo_C pull --rev 15 | 331 $ hg -R repo_C pull --rev 15 |
338 pulling from $TESTTMP/repo_A (glob) | 332 pulling from $TESTTMP/repo_A (glob) |
339 searching for changes | 333 searching for changes |
340 adding changesets | 334 adding changesets |
341 adding manifests | 335 adding manifests |
342 adding file changes | 336 adding file changes |
343 added 4 changesets with 0 changes to 0 files (+1 heads) | 337 added 4 changesets with 0 changes to 0 files (+1 heads) |
344 new changesets 4c748ffd1a46:1d8d22637c2d | |
345 (run 'hg heads .' to see heads, 'hg merge' to merge) | 338 (run 'hg heads .' to see heads, 'hg merge' to merge) |
346 $ hg -R repo_C pull | 339 $ hg -R repo_C pull |
347 pulling from $TESTTMP/repo_A (glob) | 340 pulling from $TESTTMP/repo_A (glob) |
348 searching for changes | 341 searching for changes |
349 adding changesets | 342 adding changesets |
350 adding manifests | 343 adding manifests |
351 adding file changes | 344 adding file changes |
352 added 3 changesets with 0 changes to 0 files (+3 heads) | 345 added 3 changesets with 0 changes to 0 files (+3 heads) |
353 new changesets 2702dd0c91e7:b4594d867745 | |
354 (run 'hg heads .' to see heads, 'hg merge' to merge) | 346 (run 'hg heads .' to see heads, 'hg merge' to merge) |
355 $ hg -R repo_C log -G | 347 $ hg -R repo_C log -G |
356 o 15 b4594d867745 r13 tip | 348 o 15 b4594d867745 r13 tip |
357 | | 349 | |
358 | o 14 dcbb326fdec2 r9 | 350 | o 14 dcbb326fdec2 r9 |
390 $ hg clone repo_A repo_D --rev 2 | 382 $ hg clone repo_A repo_D --rev 2 |
391 adding changesets | 383 adding changesets |
392 adding manifests | 384 adding manifests |
393 adding file changes | 385 adding file changes |
394 added 2 changesets with 0 changes to 0 files | 386 added 2 changesets with 0 changes to 0 files |
395 new changesets 1ea73414a91b:fa942426a6fd | |
396 updating to branch default | 387 updating to branch default |
397 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 388 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
398 $ hg -R repo_D pull --rev 10 | 389 $ hg -R repo_D pull --rev 10 |
399 pulling from $TESTTMP/repo_A (glob) | 390 pulling from $TESTTMP/repo_A (glob) |
400 searching for changes | 391 searching for changes |
401 adding changesets | 392 adding changesets |
402 adding manifests | 393 adding manifests |
403 adding file changes | 394 adding file changes |
404 added 5 changesets with 0 changes to 0 files | 395 added 5 changesets with 0 changes to 0 files |
405 new changesets 66f7d451a68b:ff43616e5d0f | |
406 (run 'hg update' to get a working copy) | 396 (run 'hg update' to get a working copy) |
407 $ hg -R repo_D pull --rev 15 | 397 $ hg -R repo_D pull --rev 15 |
408 pulling from $TESTTMP/repo_A (glob) | 398 pulling from $TESTTMP/repo_A (glob) |
409 searching for changes | 399 searching for changes |
410 adding changesets | 400 adding changesets |
411 adding manifests | 401 adding manifests |
412 adding file changes | 402 adding file changes |
413 added 4 changesets with 0 changes to 0 files (+1 heads) | 403 added 4 changesets with 0 changes to 0 files (+1 heads) |
414 new changesets 4c748ffd1a46:1d8d22637c2d | |
415 (run 'hg heads' to see heads, 'hg merge' to merge) | 404 (run 'hg heads' to see heads, 'hg merge' to merge) |
416 $ hg -R repo_D pull | 405 $ hg -R repo_D pull |
417 pulling from $TESTTMP/repo_A (glob) | 406 pulling from $TESTTMP/repo_A (glob) |
418 searching for changes | 407 searching for changes |
419 adding changesets | 408 adding changesets |
420 adding manifests | 409 adding manifests |
421 adding file changes | 410 adding file changes |
422 added 5 changesets with 0 changes to 0 files (+4 heads) | 411 added 5 changesets with 0 changes to 0 files (+4 heads) |
423 new changesets 2702dd0c91e7:b4594d867745 | |
424 (run 'hg heads .' to see heads, 'hg merge' to merge) | 412 (run 'hg heads .' to see heads, 'hg merge' to merge) |
425 $ hg -R repo_D log -G | 413 $ hg -R repo_D log -G |
426 o 15 b4594d867745 r13 tip | 414 o 15 b4594d867745 r13 tip |
427 | | 415 | |
428 | o 14 e46a4836065c r12 | 416 | o 14 e46a4836065c r12 |
547 $ hg clone repo_A repo_E --rev "43227190fef8" | 535 $ hg clone repo_A repo_E --rev "43227190fef8" |
548 adding changesets | 536 adding changesets |
549 adding manifests | 537 adding manifests |
550 adding file changes | 538 adding file changes |
551 added 5 changesets with 0 changes to 0 files | 539 added 5 changesets with 0 changes to 0 files |
552 new changesets 1ea73414a91b:43227190fef8 | |
553 updating to branch default | 540 updating to branch default |
554 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 541 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
555 $ hg -R repo_E pull --rev e7d9710d9fc6 | 542 $ hg -R repo_E pull --rev e7d9710d9fc6 |
556 pulling from $TESTTMP/repo_A (glob) | 543 pulling from $TESTTMP/repo_A (glob) |
557 searching for changes | 544 searching for changes |
558 adding changesets | 545 adding changesets |
559 adding manifests | 546 adding manifests |
560 adding file changes | 547 adding file changes |
561 added 1 changesets with 0 changes to 0 files (+1 heads) | 548 added 1 changesets with 0 changes to 0 files (+1 heads) |
562 new changesets e7d9710d9fc6 | |
563 (run 'hg heads' to see heads, 'hg merge' to merge) | 549 (run 'hg heads' to see heads, 'hg merge' to merge) |
564 | 550 |
565 $ hg clone repo_A repo_F --rev "1d8d22637c2d" | 551 $ hg clone repo_A repo_F --rev "1d8d22637c2d" |
566 adding changesets | 552 adding changesets |
567 adding manifests | 553 adding manifests |
568 adding file changes | 554 adding file changes |
569 added 8 changesets with 0 changes to 0 files | 555 added 8 changesets with 0 changes to 0 files |
570 new changesets 1ea73414a91b:1d8d22637c2d | |
571 updating to branch default | 556 updating to branch default |
572 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 557 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
573 $ hg -R repo_F pull --rev d62d843c9a01 | 558 $ hg -R repo_F pull --rev d62d843c9a01 |
574 pulling from $TESTTMP/repo_A (glob) | 559 pulling from $TESTTMP/repo_A (glob) |
575 searching for changes | 560 searching for changes |
576 adding changesets | 561 adding changesets |
577 adding manifests | 562 adding manifests |
578 adding file changes | 563 adding file changes |
579 added 2 changesets with 0 changes to 0 files (+1 heads) | 564 added 2 changesets with 0 changes to 0 files (+1 heads) |
580 new changesets e7d9710d9fc6:d62d843c9a01 | |
581 (run 'hg heads' to see heads, 'hg merge' to merge) | 565 (run 'hg heads' to see heads, 'hg merge' to merge) |
582 | 566 |
583 $ hg clone repo_A repo_G --rev "e7d9710d9fc6" | 567 $ hg clone repo_A repo_G --rev "e7d9710d9fc6" |
584 adding changesets | 568 adding changesets |
585 adding manifests | 569 adding manifests |
586 adding file changes | 570 adding file changes |
587 added 5 changesets with 0 changes to 0 files | 571 added 5 changesets with 0 changes to 0 files |
588 new changesets 1ea73414a91b:e7d9710d9fc6 | |
589 updating to branch default | 572 updating to branch default |
590 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 573 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
591 $ hg -R repo_G pull --rev 43227190fef8 | 574 $ hg -R repo_G pull --rev 43227190fef8 |
592 pulling from $TESTTMP/repo_A (glob) | 575 pulling from $TESTTMP/repo_A (glob) |
593 searching for changes | 576 searching for changes |
594 adding changesets | 577 adding changesets |
595 adding manifests | 578 adding manifests |
596 adding file changes | 579 adding file changes |
597 added 1 changesets with 0 changes to 0 files (+1 heads) | 580 added 1 changesets with 0 changes to 0 files (+1 heads) |
598 new changesets 43227190fef8 | |
599 (run 'hg heads' to see heads, 'hg merge' to merge) | 581 (run 'hg heads' to see heads, 'hg merge' to merge) |
600 $ hg -R repo_G pull --rev 2702dd0c91e7 | 582 $ hg -R repo_G pull --rev 2702dd0c91e7 |
601 pulling from $TESTTMP/repo_A (glob) | 583 pulling from $TESTTMP/repo_A (glob) |
602 searching for changes | 584 searching for changes |
603 adding changesets | 585 adding changesets |
604 adding manifests | 586 adding manifests |
605 adding file changes | 587 adding file changes |
606 added 3 changesets with 0 changes to 0 files (+1 heads) | 588 added 3 changesets with 0 changes to 0 files (+1 heads) |
607 new changesets 4c748ffd1a46:2702dd0c91e7 | |
608 (run 'hg heads .' to see heads, 'hg merge' to merge) | 589 (run 'hg heads .' to see heads, 'hg merge' to merge) |
609 | 590 |
610 $ for x in E F G; do | 591 $ for x in E F G; do |
611 > hg -R repo_$x showsort --rev 'e7d9710d9fc6+43227190fef8' > ${x}.non-heads.order; | 592 > hg -R repo_$x showsort --rev 'e7d9710d9fc6+43227190fef8' > ${x}.non-heads.order; |
612 > hg -R repo_$x showsort --rev 'e7d9710d9fc6' > ${x}.non-head-A.orderhead; | 593 > hg -R repo_$x showsort --rev 'e7d9710d9fc6' > ${x}.non-head-A.orderhead; |
816 $ hg clone recursion_A recursion_random --rev 0 | 797 $ hg clone recursion_A recursion_random --rev 0 |
817 adding changesets | 798 adding changesets |
818 adding manifests | 799 adding manifests |
819 adding file changes | 800 adding file changes |
820 added 1 changesets with 0 changes to 0 files | 801 added 1 changesets with 0 changes to 0 files |
821 new changesets 1ea73414a91b | |
822 updating to branch default | 802 updating to branch default |
823 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 803 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
824 $ cd recursion_random | 804 $ cd recursion_random |
825 $ for x in `python ../random_rev.py 15 5`; do | 805 $ for x in `python ../random_rev.py 15 5`; do |
826 > # using python to benefit from the random seed | 806 > # using python to benefit from the random seed |