Mercurial > hg
comparison tests/test-rename-merge2.t @ 46072:69429972ff1f
tests: correct the output order about starting a background thread for Windows
I didn't track down where this change occurred. I assume it's related to some
buffering changes, and/or an explicit flush somewhere.
Differential Revision: https://phab.mercurial-scm.org/D9539
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Mon, 07 Dec 2020 20:32:05 -0500 |
| parents | c4f14db3da1d |
| children | 38941a28406a |
comparison
equal
deleted
inserted
replaced
| 46071:f4f07cc92a47 | 46072:69429972ff1f |
|---|---|
| 83 src: 'a' -> dst: 'b' * | 83 src: 'a' -> dst: 'b' * |
| 84 checking for directory renames | 84 checking for directory renames |
| 85 resolving manifests | 85 resolving manifests |
| 86 branchmerge: True, force: False, partial: False | 86 branchmerge: True, force: False, partial: False |
| 87 ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24 | 87 ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24 |
| 88 starting 4 threads for background file closing (?) | |
| 88 preserving a for resolve of b | 89 preserving a for resolve of b |
| 89 preserving rev for resolve of rev | 90 preserving rev for resolve of rev |
| 90 starting 4 threads for background file closing (?) | |
| 91 b: remote copied from a -> m (premerge) | 91 b: remote copied from a -> m (premerge) |
| 92 starting 4 threads for background file closing (?) | |
| 93 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | 92 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 94 merging a and b to b | 93 merging a and b to b |
| 95 my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337 | 94 my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337 |
| 96 premerge successful | 95 premerge successful |
| 97 rev: versions differ -> m (premerge) | 96 rev: versions differ -> m (premerge) |
| 163 src: 'a' -> dst: 'b' * | 162 src: 'a' -> dst: 'b' * |
| 164 checking for directory renames | 163 checking for directory renames |
| 165 resolving manifests | 164 resolving manifests |
| 166 branchmerge: True, force: False, partial: False | 165 branchmerge: True, force: False, partial: False |
| 167 ancestor: 924404dff337, local: e300d1c794ec+, remote: bdb19105162a | 166 ancestor: 924404dff337, local: e300d1c794ec+, remote: bdb19105162a |
| 167 starting 4 threads for background file closing (?) | |
| 168 preserving a for resolve of b | 168 preserving a for resolve of b |
| 169 preserving rev for resolve of rev | 169 preserving rev for resolve of rev |
| 170 removing a | 170 removing a |
| 171 starting 4 threads for background file closing (?) | |
| 172 b: remote moved from a -> m (premerge) | 171 b: remote moved from a -> m (premerge) |
| 173 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | 172 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 174 merging a and b to b | 173 merging a and b to b |
| 175 my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337 | 174 my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337 |
| 176 premerge successful | 175 premerge successful |
| 202 src: 'a' -> dst: 'b' * | 201 src: 'a' -> dst: 'b' * |
| 203 checking for directory renames | 202 checking for directory renames |
| 204 resolving manifests | 203 resolving manifests |
| 205 branchmerge: True, force: False, partial: False | 204 branchmerge: True, force: False, partial: False |
| 206 ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71 | 205 ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71 |
| 207 preserving b for resolve of b | 206 starting 4 threads for background file closing (?) |
| 208 preserving rev for resolve of rev | 207 preserving b for resolve of b |
| 209 starting 4 threads for background file closing (?) | 208 preserving rev for resolve of rev |
| 210 b: local copied/moved from a -> m (premerge) | 209 b: local copied/moved from a -> m (premerge) |
| 211 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | 210 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 212 merging b and a to b | 211 merging b and a to b |
| 213 my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337 | 212 my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337 |
| 214 premerge successful | 213 premerge successful |
| 273 src: 'a' -> dst: 'b' | 272 src: 'a' -> dst: 'b' |
| 274 checking for directory renames | 273 checking for directory renames |
| 275 resolving manifests | 274 resolving manifests |
| 276 branchmerge: True, force: False, partial: False | 275 branchmerge: True, force: False, partial: False |
| 277 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336 | 276 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336 |
| 278 preserving rev for resolve of rev | 277 starting 4 threads for background file closing (?) |
| 279 starting 4 threads for background file closing (?) | 278 preserving rev for resolve of rev |
| 280 rev: versions differ -> m (premerge) | 279 rev: versions differ -> m (premerge) |
| 281 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | 280 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 282 merging rev | 281 merging rev |
| 283 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337 | 282 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337 |
| 284 rev: versions differ -> m (merge) | 283 rev: versions differ -> m (merge) |
| 339 src: 'a' -> dst: 'b' | 338 src: 'a' -> dst: 'b' |
| 340 checking for directory renames | 339 checking for directory renames |
| 341 resolving manifests | 340 resolving manifests |
| 342 branchmerge: True, force: False, partial: False | 341 branchmerge: True, force: False, partial: False |
| 343 ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336 | 342 ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336 |
| 344 preserving rev for resolve of rev | 343 starting 4 threads for background file closing (?) |
| 345 starting 4 threads for background file closing (?) | 344 preserving rev for resolve of rev |
| 346 rev: versions differ -> m (premerge) | 345 rev: versions differ -> m (premerge) |
| 347 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | 346 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 348 merging rev | 347 merging rev |
| 349 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337 | 348 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337 |
| 350 rev: versions differ -> m (merge) | 349 rev: versions differ -> m (merge) |
| 370 src: 'a' -> dst: 'b' * | 369 src: 'a' -> dst: 'b' * |
| 371 checking for directory renames | 370 checking for directory renames |
| 372 resolving manifests | 371 resolving manifests |
| 373 branchmerge: True, force: False, partial: False | 372 branchmerge: True, force: False, partial: False |
| 374 ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493 | 373 ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493 |
| 375 preserving b for resolve of b | 374 starting 4 threads for background file closing (?) |
| 376 preserving rev for resolve of rev | 375 preserving b for resolve of b |
| 377 starting 4 threads for background file closing (?) | 376 preserving rev for resolve of rev |
| 378 b: both renamed from a -> m (premerge) | 377 b: both renamed from a -> m (premerge) |
| 379 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | 378 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 380 merging b | 379 merging b |
| 381 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 | 380 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 |
| 382 rev: versions differ -> m (premerge) | 381 rev: versions differ -> m (premerge) |
| 452 src: 'a' -> dst: 'b' | 451 src: 'a' -> dst: 'b' |
| 453 checking for directory renames | 452 checking for directory renames |
| 454 resolving manifests | 453 resolving manifests |
| 455 branchmerge: True, force: False, partial: False | 454 branchmerge: True, force: False, partial: False |
| 456 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7 | 455 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7 |
| 457 preserving b for resolve of b | 456 starting 4 threads for background file closing (?) |
| 458 preserving rev for resolve of rev | 457 preserving b for resolve of b |
| 459 starting 4 threads for background file closing (?) | 458 preserving rev for resolve of rev |
| 460 b: both created -> m (premerge) | 459 b: both created -> m (premerge) |
| 461 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | 460 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 462 merging b | 461 merging b |
| 463 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 | 462 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 |
| 464 rev: versions differ -> m (premerge) | 463 rev: versions differ -> m (premerge) |
| 494 resolving manifests | 493 resolving manifests |
| 495 branchmerge: True, force: False, partial: False | 494 branchmerge: True, force: False, partial: False |
| 496 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a | 495 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a |
| 497 a: other deleted -> r | 496 a: other deleted -> r |
| 498 removing a | 497 removing a |
| 499 preserving b for resolve of b | 498 starting 4 threads for background file closing (?) |
| 500 preserving rev for resolve of rev | 499 preserving b for resolve of b |
| 501 starting 4 threads for background file closing (?) | 500 preserving rev for resolve of rev |
| 502 b: both created -> m (premerge) | 501 b: both created -> m (premerge) |
| 503 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | 502 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 504 merging b | 503 merging b |
| 505 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 | 504 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
| 506 rev: versions differ -> m (premerge) | 505 rev: versions differ -> m (premerge) |
| 572 resolving manifests | 571 resolving manifests |
| 573 branchmerge: True, force: False, partial: False | 572 branchmerge: True, force: False, partial: False |
| 574 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a | 573 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a |
| 575 a: other deleted -> r | 574 a: other deleted -> r |
| 576 removing a | 575 removing a |
| 577 preserving b for resolve of b | 576 starting 4 threads for background file closing (?) |
| 578 preserving rev for resolve of rev | 577 preserving b for resolve of b |
| 579 starting 4 threads for background file closing (?) | 578 preserving rev for resolve of rev |
| 580 b: both created -> m (premerge) | 579 b: both created -> m (premerge) |
| 581 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | 580 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 582 merging b | 581 merging b |
| 583 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 | 582 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
| 584 rev: versions differ -> m (premerge) | 583 rev: versions differ -> m (premerge) |
| 648 src: 'a' -> dst: 'b' * | 647 src: 'a' -> dst: 'b' * |
| 649 checking for directory renames | 648 checking for directory renames |
| 650 resolving manifests | 649 resolving manifests |
| 651 branchmerge: True, force: False, partial: False | 650 branchmerge: True, force: False, partial: False |
| 652 ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 | 651 ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 |
| 653 preserving b for resolve of b | 652 starting 4 threads for background file closing (?) |
| 654 preserving rev for resolve of rev | 653 preserving b for resolve of b |
| 655 starting 4 threads for background file closing (?) | 654 preserving rev for resolve of rev |
| 656 b: both renamed from a -> m (premerge) | 655 b: both renamed from a -> m (premerge) |
| 657 starting 4 threads for background file closing (?) | |
| 658 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | 656 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 659 merging b | 657 merging b |
| 660 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor a@924404dff337 | 658 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor a@924404dff337 |
| 661 premerge successful | 659 premerge successful |
| 662 rev: versions differ -> m (premerge) | 660 rev: versions differ -> m (premerge) |
| 685 src: 'a' -> dst: 'b' * | 683 src: 'a' -> dst: 'b' * |
| 686 checking for directory renames | 684 checking for directory renames |
| 687 resolving manifests | 685 resolving manifests |
| 688 branchmerge: True, force: False, partial: False | 686 branchmerge: True, force: False, partial: False |
| 689 ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a | 687 ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a |
| 690 preserving b for resolve of b | 688 starting 4 threads for background file closing (?) |
| 691 preserving rev for resolve of rev | 689 preserving b for resolve of b |
| 692 starting 4 threads for background file closing (?) | 690 preserving rev for resolve of rev |
| 693 b: both renamed from a -> m (premerge) | 691 b: both renamed from a -> m (premerge) |
| 694 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | 692 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 695 merging b | 693 merging b |
| 696 my b@02963e448370+ other b@8dbce441892a ancestor a@924404dff337 | 694 my b@02963e448370+ other b@8dbce441892a ancestor a@924404dff337 |
| 697 premerge successful | 695 premerge successful |
| 720 src: 'a' -> dst: 'b' * | 718 src: 'a' -> dst: 'b' * |
| 721 checking for directory renames | 719 checking for directory renames |
| 722 resolving manifests | 720 resolving manifests |
| 723 branchmerge: True, force: False, partial: False | 721 branchmerge: True, force: False, partial: False |
| 724 ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a | 722 ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a |
| 725 preserving b for resolve of b | 723 starting 4 threads for background file closing (?) |
| 726 preserving rev for resolve of rev | 724 preserving b for resolve of b |
| 727 starting 4 threads for background file closing (?) | 725 preserving rev for resolve of rev |
| 728 b: both renamed from a -> m (premerge) | 726 b: both renamed from a -> m (premerge) |
| 729 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | 727 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 730 merging b | 728 merging b |
| 731 my b@0b76e65c8289+ other b@bdb19105162a ancestor a@924404dff337 | 729 my b@0b76e65c8289+ other b@bdb19105162a ancestor a@924404dff337 |
| 732 premerge successful | 730 premerge successful |
| 758 src: 'a' -> dst: 'b' * | 756 src: 'a' -> dst: 'b' * |
| 759 checking for directory renames | 757 checking for directory renames |
| 760 resolving manifests | 758 resolving manifests |
| 761 branchmerge: True, force: False, partial: False | 759 branchmerge: True, force: False, partial: False |
| 762 ancestor: 924404dff337, local: e300d1c794ec+, remote: 49b6d8032493 | 760 ancestor: 924404dff337, local: e300d1c794ec+, remote: 49b6d8032493 |
| 761 starting 4 threads for background file closing (?) | |
| 763 preserving a for resolve of b | 762 preserving a for resolve of b |
| 764 preserving rev for resolve of rev | 763 preserving rev for resolve of rev |
| 765 removing a | 764 removing a |
| 766 starting 4 threads for background file closing (?) | |
| 767 b: remote moved from a -> m (premerge) | 765 b: remote moved from a -> m (premerge) |
| 768 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | 766 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 769 merging a and b to b | 767 merging a and b to b |
| 770 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 | 768 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 |
| 771 rev: versions differ -> m (premerge) | 769 rev: versions differ -> m (premerge) |
| 801 src: 'a' -> dst: 'b' * | 799 src: 'a' -> dst: 'b' * |
| 802 checking for directory renames | 800 checking for directory renames |
| 803 resolving manifests | 801 resolving manifests |
| 804 branchmerge: True, force: False, partial: False | 802 branchmerge: True, force: False, partial: False |
| 805 ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71 | 803 ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71 |
| 806 preserving b for resolve of b | 804 starting 4 threads for background file closing (?) |
| 807 preserving rev for resolve of rev | 805 preserving b for resolve of b |
| 808 starting 4 threads for background file closing (?) | 806 preserving rev for resolve of rev |
| 809 b: local copied/moved from a -> m (premerge) | 807 b: local copied/moved from a -> m (premerge) |
| 810 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | 808 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 811 merging b and a to b | 809 merging b and a to b |
| 812 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337 | 810 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337 |
| 813 rev: versions differ -> m (premerge) | 811 rev: versions differ -> m (premerge) |