926 o 13:f66f262fff6c watbar to a |
926 o 13:f66f262fff6c watbar to a |
927 | () [default] draft |
927 | () [default] draft |
928 o 0:8fa14d15e168 added hgignore |
928 o 0:8fa14d15e168 added hgignore |
929 () [default] draft |
929 () [default] draft |
930 |
930 |
|
931 Resolving content-divergence of a stack with different parents |
|
932 --------------------------------------------------------- |
|
933 |
|
934 $ cd .. |
|
935 $ hg init stackrepo1 |
|
936 $ cd stackrepo1 |
|
937 $ echo ".*\.orig" > .hgignore |
|
938 $ hg add .hgignore |
|
939 $ hg ci -m "added hgignore" |
|
940 |
|
941 $ for ch in a b c d; |
|
942 > do echo foo > $ch; |
|
943 > hg add $ch; |
|
944 > hg ci -qm "added "$ch; |
|
945 > done; |
|
946 |
|
947 $ hg glog |
|
948 @ 4:c41c793e0ef1 added d |
|
949 | () [default] draft |
|
950 o 3:ca1b80f7960a added c |
|
951 | () [default] draft |
|
952 o 2:b1661037fa25 added b |
|
953 | () [default] draft |
|
954 o 1:c7586e2a9264 added a |
|
955 | () [default] draft |
|
956 o 0:8fa14d15e168 added hgignore |
|
957 () [default] draft |
|
958 |
|
959 $ cd .. |
|
960 $ hg init stackrepo2 |
|
961 $ cd stackrepo2 |
|
962 $ hg pull ../stackrepo1 |
|
963 pulling from ../stackrepo1 |
|
964 requesting all changes |
|
965 adding changesets |
|
966 adding manifests |
|
967 adding file changes |
|
968 added 5 changesets with 5 changes to 5 files |
|
969 new changesets 8fa14d15e168:c41c793e0ef1 (5 drafts) |
|
970 (run 'hg update' to get a working copy) |
|
971 |
|
972 $ hg glog |
|
973 o 4:c41c793e0ef1 added d |
|
974 | () [default] draft |
|
975 o 3:ca1b80f7960a added c |
|
976 | () [default] draft |
|
977 o 2:b1661037fa25 added b |
|
978 | () [default] draft |
|
979 o 1:c7586e2a9264 added a |
|
980 | () [default] draft |
|
981 o 0:8fa14d15e168 added hgignore |
|
982 () [default] draft |
|
983 |
|
984 $ hg up 8fa14d15e168 |
|
985 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
986 $ echo newfile > newfile |
|
987 $ hg ci -Am "add newfile" |
|
988 adding newfile |
|
989 created new head |
|
990 $ hg rebase -s c7586e2a9264 -d . |
|
991 rebasing 1:c7586e2a9264 "added a" |
|
992 rebasing 2:b1661037fa25 "added b" |
|
993 rebasing 3:ca1b80f7960a "added c" |
|
994 rebasing 4:c41c793e0ef1 "added d" |
|
995 |
|
996 $ hg glog |
|
997 o 9:d45f050514c2 added d |
|
998 | () [default] draft |
|
999 o 8:8ed612937375 added c |
|
1000 | () [default] draft |
|
1001 o 7:6eb54b5af3fb added b |
|
1002 | () [default] draft |
|
1003 o 6:c04ff147ef79 added a |
|
1004 | () [default] draft |
|
1005 @ 5:2228e3b74514 add newfile |
|
1006 | () [default] draft |
|
1007 o 0:8fa14d15e168 added hgignore |
|
1008 () [default] draft |
|
1009 |
|
1010 $ cd ../stackrepo1 |
|
1011 $ hg up .^^^ |
|
1012 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
1013 $ echo wat > a |
|
1014 $ hg amend -m "watbar to a" |
|
1015 3 new orphan changesets |
|
1016 $ hg evolve --all |
|
1017 move:[2] added b |
|
1018 atop:[5] watbar to a |
|
1019 move:[3] added c |
|
1020 move:[4] added d |
|
1021 working directory is now at c72d2885eb51 |
|
1022 |
|
1023 $ hg glog |
|
1024 @ 8:c72d2885eb51 added d |
|
1025 | () [default] draft |
|
1026 o 7:3ce4be6d8e5e added c |
|
1027 | () [default] draft |
|
1028 o 6:d5f148423c16 added b |
|
1029 | () [default] draft |
|
1030 o 5:8e222f257bbf watbar to a |
|
1031 | () [default] draft |
|
1032 o 0:8fa14d15e168 added hgignore |
|
1033 () [default] draft |
|
1034 |
|
1035 $ hg pull ../stackrepo2 |
|
1036 pulling from ../stackrepo2 |
|
1037 searching for changes |
|
1038 adding changesets |
|
1039 adding manifests |
|
1040 adding file changes |
|
1041 added 5 changesets with 1 changes to 5 files (+1 heads) |
|
1042 4 new obsolescence markers |
|
1043 8 new content-divergent changesets |
|
1044 new changesets 2228e3b74514:d45f050514c2 (5 drafts) |
|
1045 (run 'hg heads' to see heads, 'hg merge' to merge) |
|
1046 |
|
1047 $ hg glog |
|
1048 * 13:d45f050514c2 added d |
|
1049 | () [default] draft |
|
1050 * 12:8ed612937375 added c |
|
1051 | () [default] draft |
|
1052 * 11:6eb54b5af3fb added b |
|
1053 | () [default] draft |
|
1054 * 10:c04ff147ef79 added a |
|
1055 | () [default] draft |
|
1056 o 9:2228e3b74514 add newfile |
|
1057 | () [default] draft |
|
1058 | @ 8:c72d2885eb51 added d |
|
1059 | | () [default] draft |
|
1060 | * 7:3ce4be6d8e5e added c |
|
1061 | | () [default] draft |
|
1062 | * 6:d5f148423c16 added b |
|
1063 | | () [default] draft |
|
1064 | * 5:8e222f257bbf watbar to a |
|
1065 |/ () [default] draft |
|
1066 o 0:8fa14d15e168 added hgignore |
|
1067 () [default] draft |
|
1068 |
|
1069 $ hg evolve --all --content-divergent |
|
1070 merge:[10] added a |
|
1071 with: [5] watbar to a |
|
1072 base: [1] added a |
|
1073 rebasing "other" content-divergent changeset 8e222f257bbf on 2228e3b74514 |
|
1074 updating to "local" side of the conflict: c04ff147ef79 |
|
1075 merging "other" content-divergent changeset '186bdc2cdfa2' |
|
1076 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1077 6 new orphan changesets |
|
1078 merge:[6] added b |
|
1079 with: [11] added b |
|
1080 base: [2] added b |
|
1081 updating to "local" side of the conflict: d5f148423c16 |
|
1082 merging "other" content-divergent changeset '6eb54b5af3fb' |
|
1083 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1084 merge:[7] added c |
|
1085 with: [12] added c |
|
1086 base: [3] added c |
|
1087 updating to "local" side of the conflict: 3ce4be6d8e5e |
|
1088 merging "other" content-divergent changeset '8ed612937375' |
|
1089 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1090 merge:[8] added d |
|
1091 with: [13] added d |
|
1092 base: [4] added d |
|
1093 updating to "local" side of the conflict: c72d2885eb51 |
|
1094 merging "other" content-divergent changeset 'd45f050514c2' |
|
1095 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1096 working directory is now at c8f73c376a6e |
|
1097 |
|
1098 $ hg glog |
|
1099 @ 18:c8f73c376a6e added d |
|
1100 | () [default] draft |
|
1101 o 17:77126af93a25 added c |
|
1102 | () [default] draft |
|
1103 o 16:4e29776e83a5 added b |
|
1104 | () [default] draft |
|
1105 o 15:74fbf3e6a0b6 watbar to a |
|
1106 | () [default] draft |
|
1107 o 9:2228e3b74514 add newfile |
|
1108 | () [default] draft |
|
1109 o 0:8fa14d15e168 added hgignore |
|
1110 () [default] draft |
931 |
1111 |
932 Test to make sure that evolve don't fall into unrecoverable state (issue6053) |
1112 Test to make sure that evolve don't fall into unrecoverable state (issue6053) |
933 ------------------------------------------------------------------------------ |
1113 ------------------------------------------------------------------------------ |
934 |
1114 |
935 It happened when two divergent csets has different parent (need relocation) |
1115 It happened when two divergent csets has different parent (need relocation) |