comparison tests/test-evolve-content-divergence.t @ 3850:340cf6fbe9e9

evolve: create resolved cset on successors of current parents While resolving content-divergence, sometimes, the parent can be obsolete and have a successor. We should consider the successors of the parents instead of obsolete parents as that will do something like orphan+content-divergence resolution both at the same time which is powerful and results in a single stack while resolving content-divergence of stacks. The test changes demonstrates that we can now successfully evolve a content divergent stack.
author Pulkit Goyal <7895pulkit@gmail.com>
date Thu, 14 Jun 2018 01:39:33 +0530
parents a17d4934c5ce
children 629558d09898
comparison
equal deleted inserted replaced
3849:a17d4934c5ce 3850:340cf6fbe9e9
874 base: [1] added a 874 base: [1] added a
875 updating to "local" side of the conflict: 8e222f257bbf 875 updating to "local" side of the conflict: 8e222f257bbf
876 merging "other" content-divergent changeset '82b74d5dc678' 876 merging "other" content-divergent changeset '82b74d5dc678'
877 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 877 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
878 6 new orphan changesets 878 6 new orphan changesets
879 skipping d5f148423c16: have a different parent than 88516dccf68a (not handled yet) 879 merge:[6] added b
880 | d5f148423c16, 88516dccf68a are not based on the same changeset. 880 with: [10] added b
881 | With the current state of its implementation, 881 base: [2] added b
882 | evolve does not work in that case. 882 updating to "local" side of the conflict: d5f148423c16
883 | rebase one of them next to the other and run 883 merging "other" content-divergent changeset '88516dccf68a'
884 | this command again. 884 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
885 | - either: hg rebase --dest 'p1(d5f148423c16)' -r 88516dccf68a 885 merge:[7] added c
886 | - or: hg rebase --dest 'p1(88516dccf68a)' -r d5f148423c16 886 with: [11] added c
887 skipping 3ce4be6d8e5e: have a different parent than 9e5fb1d5b955 (not handled yet) 887 base: [3] added c
888 | 3ce4be6d8e5e, 9e5fb1d5b955 are not based on the same changeset. 888 updating to "local" side of the conflict: 3ce4be6d8e5e
889 | With the current state of its implementation, 889 merging "other" content-divergent changeset '9e5fb1d5b955'
890 | evolve does not work in that case. 890 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
891 | rebase one of them next to the other and run 891 merge:[8] added d
892 | this command again. 892 with: [12] added d
893 | - either: hg rebase --dest 'p1(3ce4be6d8e5e)' -r 9e5fb1d5b955 893 base: [4] added d
894 | - or: hg rebase --dest 'p1(9e5fb1d5b955)' -r 3ce4be6d8e5e 894 updating to "local" side of the conflict: c72d2885eb51
895 skipping c72d2885eb51: have a different parent than 15c781f93cac (not handled yet) 895 merging "other" content-divergent changeset '15c781f93cac'
896 | c72d2885eb51, 15c781f93cac are not based on the same changeset. 896 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
897 | With the current state of its implementation, 897 working directory is now at 038fe7db3d88
898 | evolve does not work in that case. 898
899 | rebase one of them next to the other and run 899 $ hg glog
900 | this command again. 900 @ 16:038fe7db3d88 added d
901 | - either: hg rebase --dest 'p1(c72d2885eb51)' -r 15c781f93cac 901 | () [default] draft
902 | - or: hg rebase --dest 'p1(15c781f93cac)' -r c72d2885eb51 902 o 15:b2cac10f3836 added c
903 working directory is now at f66f262fff6c 903 | () [default] draft
904 904 o 14:eadfd9d70680 added b
905 $ hg glog 905 | () [default] draft
906 @ 13:f66f262fff6c watbar to a 906 o 13:f66f262fff6c watbar to a
907 | () [default] draft 907 | () [default] draft
908 | * 12:15c781f93cac added d 908 o 0:8fa14d15e168 added hgignore
909 | | () [default] draft 909 () [default] draft
910 | * 11:9e5fb1d5b955 added c
911 | | () [default] draft
912 | * 10:88516dccf68a added b
913 | | () [default] draft
914 | x 9:82b74d5dc678 watbar to a
915 |/ () [default] draft
916 | * 8:c72d2885eb51 added d
917 | | () [default] draft
918 | * 7:3ce4be6d8e5e added c
919 | | () [default] draft
920 | * 6:d5f148423c16 added b
921 | | () [default] draft
922 | x 5:8e222f257bbf watbar to a
923 |/ () [default] draft
924 o 0:8fa14d15e168 added hgignore
925 () [default] draft