Mercurial > hg
comparison tests/test-rename-merge2.t @ 45488:c4f14db3da1d
merge: move initial handling of mergeactions near to later one
We build `mergeactions` in the beginning and use it in end. Let's build it just
before where it will be used. Helps making code much easier to understand.
Differential Revision: https://phab.mercurial-scm.org/D8983
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Thu, 03 Sep 2020 13:25:29 +0530 |
| parents | 35d2afc6966a |
| children | 69429972ff1f |
comparison
equal
deleted
inserted
replaced
| 45487:78f0bb37f52d | 45488:c4f14db3da1d |
|---|---|
| 87 ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24 | 87 ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24 |
| 88 preserving a for resolve of b | 88 preserving a for resolve of b |
| 89 preserving rev for resolve of rev | 89 preserving rev for resolve of rev |
| 90 starting 4 threads for background file closing (?) | 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 (?) | |
| 92 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | 93 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 93 merging a and b to b | 94 merging a and b to b |
| 94 my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337 | 95 my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337 |
| 95 premerge successful | 96 premerge successful |
| 96 rev: versions differ -> m (premerge) | 97 rev: versions differ -> m (premerge) |
| 122 src: 'a' -> dst: 'b' * | 123 src: 'a' -> dst: 'b' * |
| 123 checking for directory renames | 124 checking for directory renames |
| 124 resolving manifests | 125 resolving manifests |
| 125 branchmerge: True, force: False, partial: False | 126 branchmerge: True, force: False, partial: False |
| 126 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: f4db7e329e71 | 127 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: f4db7e329e71 |
| 127 preserving b for resolve of b | |
| 128 preserving rev for resolve of rev | |
| 129 a: remote is newer -> g | 128 a: remote is newer -> g |
| 130 getting a | 129 getting a |
| 130 preserving b for resolve of b | |
| 131 preserving rev for resolve of rev | |
| 131 b: local copied/moved from a -> m (premerge) | 132 b: local copied/moved from a -> m (premerge) |
| 132 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | 133 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 133 merging b and a to b | 134 merging b and a to b |
| 134 my b@86a2aa42fc76+ other a@f4db7e329e71 ancestor a@924404dff337 | 135 my b@86a2aa42fc76+ other a@f4db7e329e71 ancestor a@924404dff337 |
| 135 premerge successful | 136 premerge successful |
| 239 src: 'a' -> dst: 'b' | 240 src: 'a' -> dst: 'b' |
| 240 checking for directory renames | 241 checking for directory renames |
| 241 resolving manifests | 242 resolving manifests |
| 242 branchmerge: True, force: False, partial: False | 243 branchmerge: True, force: False, partial: False |
| 243 ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: 4ce40f5aca24 | 244 ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: 4ce40f5aca24 |
| 244 preserving rev for resolve of rev | |
| 245 b: remote created -> g | 245 b: remote created -> g |
| 246 getting b | 246 getting b |
| 247 preserving rev for resolve of rev | |
| 247 rev: versions differ -> m (premerge) | 248 rev: versions differ -> m (premerge) |
| 248 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | 249 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 249 merging rev | 250 merging rev |
| 250 my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337 | 251 my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
| 251 rev: versions differ -> m (merge) | 252 rev: versions differ -> m (merge) |
| 304 src: 'a' -> dst: 'b' | 305 src: 'a' -> dst: 'b' |
| 305 checking for directory renames | 306 checking for directory renames |
| 306 resolving manifests | 307 resolving manifests |
| 307 branchmerge: True, force: False, partial: False | 308 branchmerge: True, force: False, partial: False |
| 308 ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: bdb19105162a | 309 ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: bdb19105162a |
| 309 preserving rev for resolve of rev | |
| 310 a: other deleted -> r | 310 a: other deleted -> r |
| 311 removing a | 311 removing a |
| 312 b: remote created -> g | 312 b: remote created -> g |
| 313 getting b | 313 getting b |
| 314 preserving rev for resolve of rev | |
| 314 rev: versions differ -> m (premerge) | 315 rev: versions differ -> m (premerge) |
| 315 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | 316 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 316 merging rev | 317 merging rev |
| 317 my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337 | 318 my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337 |
| 318 rev: versions differ -> m (merge) | 319 rev: versions differ -> m (merge) |
| 420 branchmerge: True, force: False, partial: False | 421 branchmerge: True, force: False, partial: False |
| 421 ancestor: 924404dff337, local: 02963e448370+, remote: fe905ef2c33e | 422 ancestor: 924404dff337, local: 02963e448370+, remote: fe905ef2c33e |
| 422 note: possible conflict - a was renamed multiple times to: | 423 note: possible conflict - a was renamed multiple times to: |
| 423 b | 424 b |
| 424 c | 425 c |
| 425 preserving rev for resolve of rev | |
| 426 c: remote created -> g | 426 c: remote created -> g |
| 427 getting c | 427 getting c |
| 428 preserving rev for resolve of rev | |
| 428 rev: versions differ -> m (premerge) | 429 rev: versions differ -> m (premerge) |
| 429 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | 430 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 430 merging rev | 431 merging rev |
| 431 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 | 432 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 |
| 432 rev: versions differ -> m (merge) | 433 rev: versions differ -> m (merge) |
| 491 src: 'a' -> dst: 'b' | 492 src: 'a' -> dst: 'b' |
| 492 checking for directory renames | 493 checking for directory renames |
| 493 resolving manifests | 494 resolving manifests |
| 494 branchmerge: True, force: False, partial: False | 495 branchmerge: True, force: False, partial: False |
| 495 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a | 496 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a |
| 496 preserving b for resolve of b | |
| 497 preserving rev for resolve of rev | |
| 498 a: other deleted -> r | 497 a: other deleted -> r |
| 499 removing a | 498 removing a |
| 499 preserving b for resolve of b | |
| 500 preserving rev for resolve of rev | |
| 500 starting 4 threads for background file closing (?) | 501 starting 4 threads for background file closing (?) |
| 501 b: both created -> m (premerge) | 502 b: both created -> m (premerge) |
| 502 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | 503 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 503 merging b | 504 merging b |
| 504 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 | 505 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
| 532 src: 'a' -> dst: 'b' * | 533 src: 'a' -> dst: 'b' * |
| 533 checking for directory renames | 534 checking for directory renames |
| 534 resolving manifests | 535 resolving manifests |
| 535 branchmerge: True, force: False, partial: False | 536 branchmerge: True, force: False, partial: False |
| 536 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a | 537 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a |
| 537 preserving b for resolve of b | |
| 538 preserving rev for resolve of rev | |
| 539 a: remote is newer -> g | 538 a: remote is newer -> g |
| 540 getting a | 539 getting a |
| 540 preserving b for resolve of b | |
| 541 preserving rev for resolve of rev | |
| 541 b: both renamed from a -> m (premerge) | 542 b: both renamed from a -> m (premerge) |
| 542 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | 543 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 543 merging b | 544 merging b |
| 544 my b@86a2aa42fc76+ other b@8dbce441892a ancestor a@924404dff337 | 545 my b@86a2aa42fc76+ other b@8dbce441892a ancestor a@924404dff337 |
| 545 premerge successful | 546 premerge successful |
| 569 src: 'a' -> dst: 'b' | 570 src: 'a' -> dst: 'b' |
| 570 checking for directory renames | 571 checking for directory renames |
| 571 resolving manifests | 572 resolving manifests |
| 572 branchmerge: True, force: False, partial: False | 573 branchmerge: True, force: False, partial: False |
| 573 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a | 574 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a |
| 574 preserving b for resolve of b | |
| 575 preserving rev for resolve of rev | |
| 576 a: other deleted -> r | 575 a: other deleted -> r |
| 577 removing a | 576 removing a |
| 577 preserving b for resolve of b | |
| 578 preserving rev for resolve of rev | |
| 578 starting 4 threads for background file closing (?) | 579 starting 4 threads for background file closing (?) |
| 579 b: both created -> m (premerge) | 580 b: both created -> m (premerge) |
| 580 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | 581 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 581 merging b | 582 merging b |
| 582 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 | 583 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
| 610 src: 'a' -> dst: 'b' * | 611 src: 'a' -> dst: 'b' * |
| 611 checking for directory renames | 612 checking for directory renames |
| 612 resolving manifests | 613 resolving manifests |
| 613 branchmerge: True, force: False, partial: False | 614 branchmerge: True, force: False, partial: False |
| 614 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a | 615 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a |
| 615 preserving b for resolve of b | |
| 616 preserving rev for resolve of rev | |
| 617 a: remote is newer -> g | 616 a: remote is newer -> g |
| 618 getting a | 617 getting a |
| 618 preserving b for resolve of b | |
| 619 preserving rev for resolve of rev | |
| 619 b: both renamed from a -> m (premerge) | 620 b: both renamed from a -> m (premerge) |
| 620 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | 621 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 621 merging b | 622 merging b |
| 622 my b@86a2aa42fc76+ other b@8dbce441892a ancestor a@924404dff337 | 623 my b@86a2aa42fc76+ other b@8dbce441892a ancestor a@924404dff337 |
| 623 premerge successful | 624 premerge successful |
| 651 ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 | 652 ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 |
| 652 preserving b for resolve of b | 653 preserving b for resolve of b |
| 653 preserving rev for resolve of rev | 654 preserving rev for resolve of rev |
| 654 starting 4 threads for background file closing (?) | 655 starting 4 threads for background file closing (?) |
| 655 b: both renamed from a -> m (premerge) | 656 b: both renamed from a -> m (premerge) |
| 657 starting 4 threads for background file closing (?) | |
| 656 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | 658 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 657 merging b | 659 merging b |
| 658 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor a@924404dff337 | 660 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor a@924404dff337 |
| 659 premerge successful | 661 premerge successful |
| 660 rev: versions differ -> m (premerge) | 662 rev: versions differ -> m (premerge) |
| 846 src: 'a' -> dst: 'b' * | 848 src: 'a' -> dst: 'b' * |
| 847 checking for directory renames | 849 checking for directory renames |
| 848 resolving manifests | 850 resolving manifests |
| 849 branchmerge: True, force: False, partial: False | 851 branchmerge: True, force: False, partial: False |
| 850 ancestor: 924404dff337, local: 02963e448370+, remote: 2b958612230f | 852 ancestor: 924404dff337, local: 02963e448370+, remote: 2b958612230f |
| 851 preserving b for resolve of b | |
| 852 preserving rev for resolve of rev | |
| 853 c: remote created -> g | 853 c: remote created -> g |
| 854 getting c | 854 getting c |
| 855 preserving b for resolve of b | |
| 856 preserving rev for resolve of rev | |
| 855 b: local copied/moved from a -> m (premerge) | 857 b: local copied/moved from a -> m (premerge) |
| 856 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | 858 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 857 merging b and a to b | 859 merging b and a to b |
| 858 my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337 | 860 my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337 |
| 859 premerge successful | 861 premerge successful |