Mercurial > evolve
comparison tests/test-evolve-phase-divergence.t @ 4363:a2fdbece7ce1 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 22 Jan 2019 12:57:25 -0500 |
| parents | 522abf1d70b7 04aeaec6ec07 |
| children | f54bb6eaf5e6 |
comparison
equal
deleted
inserted
replaced
| 4362:8bd60e09dfb4 | 4363:a2fdbece7ce1 |
|---|---|
| 112 XXX: pull should tell us how to see what is the new phase-divergent changeset | 112 XXX: pull should tell us how to see what is the new phase-divergent changeset |
| 113 $ hg pull ../public | 113 $ hg pull ../public |
| 114 pulling from ../public | 114 pulling from ../public |
| 115 searching for changes | 115 searching for changes |
| 116 no changes found | 116 no changes found |
| 117 1 new phase-divergent changesets | |
| 118 | 117 |
| 119 $ hg glog | 118 $ hg glog |
| 120 @ 2:98bb3a6cfe1a tweak a | 119 @ 2:98bb3a6cfe1a tweak a |
| 121 | () draft | 120 | () draft |
| 122 | o 1:4d1169d82e47 modify a | 121 | o 1:4d1169d82e47 modify a |
| 280 | 279 |
| 281 $ hg pull ../public | 280 $ hg pull ../public |
| 282 pulling from ../public | 281 pulling from ../public |
| 283 searching for changes | 282 searching for changes |
| 284 no changes found | 283 no changes found |
| 285 1 new phase-divergent changesets | |
| 286 | 284 |
| 287 $ hg glog | 285 $ hg glog |
| 288 @ 4:d47f2b37ed82 added bar to foo | 286 @ 4:d47f2b37ed82 added bar to foo |
| 289 | (bm) draft | 287 | (bm) draft |
| 290 | o 3:aa071e5554e3 added foo to foo | 288 | o 3:aa071e5554e3 added foo to foo |
| 431 | 429 |
| 432 $ hg pull ../public | 430 $ hg pull ../public |
| 433 pulling from ../public | 431 pulling from ../public |
| 434 searching for changes | 432 searching for changes |
| 435 no changes found | 433 no changes found |
| 436 1 new phase-divergent changesets | |
| 437 | 434 |
| 438 $ hg glog | 435 $ hg glog |
| 439 @ 7:2c3560aedead foo to bar | 436 @ 7:2c3560aedead foo to bar |
| 440 | (bm) draft | 437 | (bm) draft |
| 441 | o 6:b756eb10ea73 added bar to bar | 438 | o 6:b756eb10ea73 added bar to bar |
| 560 | 557 |
| 561 $ hg pull ../public | 558 $ hg pull ../public |
| 562 pulling from ../public | 559 pulling from ../public |
| 563 searching for changes | 560 searching for changes |
| 564 no changes found | 561 no changes found |
| 565 1 new phase-divergent changesets | |
| 566 | 562 |
| 567 $ hg obslog -r . | 563 $ hg obslog -r . |
| 568 @ 334e300d6db5 (10) added x to x | 564 @ 334e300d6db5 (10) added x to x |
| 569 | | 565 | |
| 570 o 2352021b3785 (9) added x to x | 566 o 2352021b3785 (9) added x to x |
| 571 rewritten(parent) as 334e300d6db5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) | 567 rewritten(parent) as 334e300d6db5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
| 572 | 568 |
| 573 $ hg glog -r .^:: | 569 $ hg glog -r .^:: |
| 574 @ 10:334e300d6db5 added x to x | 570 hg: parse error at 4: not a prefix: end |
| 575 | (bm) draft | 571 [255] |
| 576 | o 9:2352021b3785 added x to x | |
| 577 | | () public | |
| 578 | o 8:502e73736632 phase-divergent update to b756eb10ea73: | |
| 579 | | () public | |
| 580 | o 6:b756eb10ea73 added bar to bar | |
| 581 |/ () public | |
| 582 o 5:3d62500c673d phase-divergent update to aa071e5554e3: | |
| 583 | () public | |
| 584 ~ | |
| 585 | 572 |
| 586 Using `hg evolve` to resolve phase-divergence | 573 Using `hg evolve` to resolve phase-divergence |
| 587 --------------------------------------------- | 574 --------------------------------------------- |
| 588 | 575 |
| 589 $ hg evolve --phase-divergent | 576 $ hg evolve --phase-divergent |
| 671 $ hg amend | 658 $ hg amend |
| 672 | 659 |
| 673 Alice making the old changeset public to have content-divergence | 660 Alice making the old changeset public to have content-divergence |
| 674 | 661 |
| 675 $ hg phase -r dc88f5aa9bc9 --public --hidden | 662 $ hg phase -r dc88f5aa9bc9 --public --hidden |
| 676 1 new phase-divergent changesets | |
| 677 $ hg glog | 663 $ hg glog |
| 678 @ 14:13015a180eee y to y and foobar to foo | 664 @ 14:13015a180eee y to y and foobar to foo |
| 679 | () draft | 665 | () draft |
| 680 | o 12:dc88f5aa9bc9 y to y and foobar to foo | 666 | o 12:dc88f5aa9bc9 y to y and foobar to foo |
| 681 | | () public | 667 | | () public |
| 774 x f3794e5a91dc (17) added l to l | 760 x f3794e5a91dc (17) added l to l |
| 775 rewritten(parent) as 2bfd56949cf0 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) | 761 rewritten(parent) as 2bfd56949cf0 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
| 776 | 762 |
| 777 | 763 |
| 778 $ hg phase -r f3794e5a91dc --public --hidden | 764 $ hg phase -r f3794e5a91dc --public --hidden |
| 779 1 new phase-divergent changesets | |
| 780 | 765 |
| 781 Resolution using `hg evolve --phase-divergent` | 766 Resolution using `hg evolve --phase-divergent` |
| 782 ---------------------------------------------- | 767 ---------------------------------------------- |
| 783 | 768 |
| 784 $ hg evolve --phase-divergent | 769 $ hg evolve --phase-divergent |
| 883 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 868 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 884 | 869 |
| 885 $ hg evolve --list | 870 $ hg evolve --list |
| 886 | 871 |
| 887 $ hg phase -r 428f7900a969 --public --hidden | 872 $ hg phase -r 428f7900a969 --public --hidden |
| 888 1 new phase-divergent changesets | |
| 889 | 873 |
| 890 $ hg glog -r f3794e5a91dc:: | 874 $ hg glog -r f3794e5a91dc:: |
| 891 @ 24:390acb97e50a added f | 875 @ 24:390acb97e50a added f |
| 892 | () draft | 876 | () draft |
| 893 | o 23:428f7900a969 added g | 877 | o 23:428f7900a969 added g |
| 963 | 947 |
| 964 $ hg prune -r 849cee0a874b --succ f313e2b90e70 --succ 63ccb8ea7cae --split | 948 $ hg prune -r 849cee0a874b --succ f313e2b90e70 --succ 63ccb8ea7cae --split |
| 965 1 changesets pruned | 949 1 changesets pruned |
| 966 | 950 |
| 967 $ hg phase -r 849cee0a874b --hidden --public | 951 $ hg phase -r 849cee0a874b --hidden --public |
| 968 2 new phase-divergent changesets | |
| 969 | 952 |
| 970 $ hg glog -r 428f7900a969:: | 953 $ hg glog -r 428f7900a969:: |
| 971 @ 28:63ccb8ea7cae added n | 954 @ 28:63ccb8ea7cae added n |
| 972 | () draft | 955 | () draft |
| 973 * 27:f313e2b90e70 added m | 956 o 27:f313e2b90e70 added m |
| 974 | () draft | 957 | () draft |
| 975 | o 26:849cee0a874b added m and n | 958 | o 26:849cee0a874b added m and n |
| 976 |/ () public | 959 |/ () public |
| 977 o 23:428f7900a969 added g | 960 o 23:428f7900a969 added g |
| 978 | () public | 961 | () public |
| 981 $ hg evolve --all --phase-divergent | 964 $ hg evolve --all --phase-divergent |
| 982 recreate:[27] added m | 965 recreate:[27] added m |
| 983 atop:[26] added m and n | 966 atop:[26] added m and n |
| 984 computing new diff | 967 computing new diff |
| 985 committed as 870e1c3eddc3 | 968 committed as 870e1c3eddc3 |
| 986 1 new orphan changesets | |
| 987 recreate:[28] added n | 969 recreate:[28] added n |
| 988 atop:[26] added m and n | 970 atop:[26] added m and n |
| 989 rebasing to destination parent: 428f7900a969 | 971 rebasing to destination parent: 428f7900a969 |
| 990 computing new diff | 972 computing new diff |
| 991 committed as 154b0179fb9b | 973 committed as 154b0179fb9b |
| 1076 | 1058 |
| 1077 $ hg prune -r 8a70f55b2af3 --succ 6f8c250eecff --succ e046341aa97c --split | 1059 $ hg prune -r 8a70f55b2af3 --succ 6f8c250eecff --succ e046341aa97c --split |
| 1078 1 changesets pruned | 1060 1 changesets pruned |
| 1079 | 1061 |
| 1080 $ hg phase -r 8a70f55b2af3 --public --hidden | 1062 $ hg phase -r 8a70f55b2af3 --public --hidden |
| 1081 2 new phase-divergent changesets | |
| 1082 | 1063 |
| 1083 $ hg glog -r 154b0179fb9b:: | 1064 $ hg glog -r 154b0179fb9b:: |
| 1084 @ 34:e046341aa97c added q | 1065 @ 34:e046341aa97c added q |
| 1085 | () draft | 1066 | () draft |
| 1086 | * 33:6f8c250eecff added p | 1067 | o 33:6f8c250eecff added p |
| 1087 |/ () draft | 1068 |/ () draft |
| 1088 | o 32:8a70f55b2af3 added p and q | 1069 | o 32:8a70f55b2af3 added p and q |
| 1089 |/ () public | 1070 |/ () public |
| 1090 o 31:154b0179fb9b phase-divergent update to 849cee0a874b: | 1071 o 31:154b0179fb9b phase-divergent update to 849cee0a874b: |
| 1091 | () public | 1072 | () public |
| 1219 | 1200 |
| 1220 $ hg prune -r 12ebe0d625d7 --succ . | 1201 $ hg prune -r 12ebe0d625d7 --succ . |
| 1221 1 changesets pruned | 1202 1 changesets pruned |
| 1222 | 1203 |
| 1223 $ hg phase 12ebe0d625d7 --hidden --public | 1204 $ hg phase 12ebe0d625d7 --hidden --public |
| 1224 1 new phase-divergent changesets | |
| 1225 | 1205 |
| 1226 Resolution of phase-divergent merge commit using `hg evolve` | 1206 Resolution of phase-divergent merge commit using `hg evolve` |
| 1227 | 1207 |
| 1228 XXX: we should handle phase-divergent merges | 1208 XXX: we should handle phase-divergent merges |
| 1229 $ hg evolve --phase-divergent | 1209 $ hg evolve --phase-divergent |