66 |
66 |
67 |
67 |
68 $ cd .. |
68 $ cd .. |
69 |
69 |
70 =============================================================================== |
70 =============================================================================== |
71 Test instability resolution for a merge changeset unstable because one |
|
72 of its parent is obsolete |
|
73 Not supported yet |
|
74 ============================================================================== |
|
75 |
|
76 $ hg init test2 |
|
77 $ cd test2 |
|
78 $ mkcommit base |
|
79 $ mkcommits _a |
|
80 $ hg up "desc(base)" |
|
81 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
82 $ mkcommit _c |
|
83 created new head |
|
84 $ hg merge "desc(_a)" >/dev/null |
|
85 $ hg commit -m "merge" |
|
86 $ hg up "desc(_a)" |
|
87 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
88 $ hg amend -m "aprime" |
|
89 1 new orphan changesets |
|
90 $ hg log -G |
|
91 @ 4:47127ea62e5f@default(draft) aprime |
|
92 | |
|
93 | * 3:6b4280e33286@default(draft) merge |
|
94 | |\ |
|
95 +---o 2:474da87dd33b@default(draft) add _c |
|
96 | | |
|
97 | x 1:b3264cec9506@default(draft) add _a |
|
98 |/ |
|
99 o 0:b4952fcf48cf@default(draft) add base |
|
100 |
|
101 |
|
102 $ hg evo --all --any --orphan |
|
103 move:[3] merge |
|
104 atop:[4] aprime |
|
105 working directory is now at 0bf3f3a59c8c |
|
106 $ hg log -G |
|
107 @ 5:0bf3f3a59c8c@default(draft) merge |
|
108 |\ |
|
109 | o 4:47127ea62e5f@default(draft) aprime |
|
110 | | |
|
111 o | 2:474da87dd33b@default(draft) add _c |
|
112 |/ |
|
113 o 0:b4952fcf48cf@default(draft) add base |
|
114 |
|
115 |
|
116 $ cd .. |
|
117 |
|
118 =============================================================================== |
|
119 Test instability resolution for a merge changeset unstable because both |
|
120 of its parent are obsolete |
|
121 Not supported yet |
|
122 ============================================================================== |
|
123 |
|
124 $ hg init test3 |
|
125 $ cd test3 |
|
126 $ mkcommit base |
|
127 $ mkcommits _a |
|
128 $ hg up "desc(base)" |
|
129 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
130 $ mkcommit _c |
|
131 created new head |
|
132 $ hg merge "desc(_a)" >/dev/null |
|
133 $ hg commit -m "merge" |
|
134 $ hg up "desc(_a)" |
|
135 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
136 $ hg amend -m "aprime" |
|
137 1 new orphan changesets |
|
138 $ hg up "desc(_c)" |
|
139 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
140 $ hg amend -m "cprime" |
|
141 $ hg log -G |
|
142 @ 5:2db39fda7e2f@default(draft) cprime |
|
143 | |
|
144 | o 4:47127ea62e5f@default(draft) aprime |
|
145 |/ |
|
146 | * 3:6b4280e33286@default(draft) merge |
|
147 | |\ |
|
148 +---x 2:474da87dd33b@default(draft) add _c |
|
149 | | |
|
150 | x 1:b3264cec9506@default(draft) add _a |
|
151 |/ |
|
152 o 0:b4952fcf48cf@default(draft) add base |
|
153 |
|
154 |
|
155 $ hg evo --all --any --orphan |
|
156 warning: no support for evolving merge changesets with two obsolete parents yet |
|
157 (Redo the merge (6b4280e33286) and use `hg prune <old> --succ <new>` to obsolete the old one) |
|
158 $ hg log -G |
|
159 @ 5:2db39fda7e2f@default(draft) cprime |
|
160 | |
|
161 | o 4:47127ea62e5f@default(draft) aprime |
|
162 |/ |
|
163 | * 3:6b4280e33286@default(draft) merge |
|
164 | |\ |
|
165 +---x 2:474da87dd33b@default(draft) add _c |
|
166 | | |
|
167 | x 1:b3264cec9506@default(draft) add _a |
|
168 |/ |
|
169 o 0:b4952fcf48cf@default(draft) add base |
|
170 |
|
171 |
|
172 $ cd .. |
|
173 |
|
174 =============================================================================== |
|
175 Test instability resolution for a changeset unstable because its parent |
|
176 is obsolete with multiple successors all in one chain (simple split) |
|
177 ============================================================================== |
|
178 |
|
179 $ hg init test4 |
|
180 $ cd test4 |
|
181 $ mkcommits _a _b _c |
|
182 $ hg up "desc(_a)" |
|
183 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
184 $ mkcommits bprimesplit1 bprimesplit2 |
|
185 created new head |
|
186 $ hg prune "desc(_b)" -s "desc(bprimesplit1) + desc(bprimesplit2)" --split |
|
187 1 changesets pruned |
|
188 1 new orphan changesets |
|
189 $ hg log -G |
|
190 @ 4:2a4ccc0bb20c@default(draft) add bprimesplit2 |
|
191 | |
|
192 o 3:8b87864bd0f4@default(draft) add bprimesplit1 |
|
193 | |
|
194 | * 2:102002290587@default(draft) add _c |
|
195 | | |
|
196 | x 1:37445b16603b@default(draft) add _b |
|
197 |/ |
|
198 o 0:135f39f4bd78@default(draft) add _a |
|
199 |
|
200 |
|
201 $ hg evo --all --any --orphan |
|
202 move:[2] add _c |
|
203 atop:[4] add bprimesplit2 |
|
204 working directory is now at 387cc1e837d7 |
|
205 $ hg log -G |
|
206 @ 5:387cc1e837d7@default(draft) add _c |
|
207 | |
|
208 o 4:2a4ccc0bb20c@default(draft) add bprimesplit2 |
|
209 | |
|
210 o 3:8b87864bd0f4@default(draft) add bprimesplit1 |
|
211 | |
|
212 o 0:135f39f4bd78@default(draft) add _a |
|
213 |
|
214 |
|
215 |
|
216 $ cd .. |
|
217 |
|
218 =============================================================================== |
|
219 Test instability resolution for a changeset unstable because its parent |
71 Test instability resolution for a changeset unstable because its parent |
220 is obsolete with multiple successors on one branches but in reverse |
72 is obsolete with multiple successors on one branches but in reverse |
221 order (cross-split). |
73 order (cross-split). |
222 ============================================================================== |
74 ============================================================================== |
223 |
75 |
264 o 5:8ffdae67d696@default(draft) add bsecondsplit1 |
116 o 5:8ffdae67d696@default(draft) add bsecondsplit1 |
265 | |
117 | |
266 o 0:135f39f4bd78@default(draft) add _a |
118 o 0:135f39f4bd78@default(draft) add _a |
267 |
119 |
268 |
120 |
269 |
|
270 $ cd .. |
121 $ cd .. |
271 |
|
272 =============================================================================== |
|
273 Test instability resolution for a changeset unstable because its parent |
|
274 is obsolete with multiple successors on two branches. |
|
275 Not supported yet |
|
276 ============================================================================== |
|
277 |
|
278 $ hg init test6 |
|
279 $ cd test6 |
|
280 $ mkcommits _a _b _c |
|
281 $ hg up "desc(_a)" |
|
282 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
283 $ mkcommit bprimesplit1 |
|
284 created new head |
|
285 $ hg up "desc(_a)" |
|
286 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
287 $ mkcommit bprimesplit2 |
|
288 created new head |
|
289 $ hg prune "desc(_b)" -s "desc(bprimesplit1) + desc(bprimesplit2)" --split |
|
290 1 changesets pruned |
|
291 1 new orphan changesets |
|
292 $ hg log -G |
|
293 @ 4:3c69ea6aa93e@default(draft) add bprimesplit2 |
|
294 | |
|
295 | o 3:8b87864bd0f4@default(draft) add bprimesplit1 |
|
296 |/ |
|
297 | * 2:102002290587@default(draft) add _c |
|
298 | | |
|
299 | x 1:37445b16603b@default(draft) add _b |
|
300 |/ |
|
301 o 0:135f39f4bd78@default(draft) add _a |
|
302 |
|
303 |
|
304 $ hg evo --all --any --orphan |
|
305 cannot solve split across two branches |
|
306 $ hg log -G |
|
307 @ 4:3c69ea6aa93e@default(draft) add bprimesplit2 |
|
308 | |
|
309 | o 3:8b87864bd0f4@default(draft) add bprimesplit1 |
|
310 |/ |
|
311 | * 2:102002290587@default(draft) add _c |
|
312 | | |
|
313 | x 1:37445b16603b@default(draft) add _b |
|
314 |/ |
|
315 o 0:135f39f4bd78@default(draft) add _a |
|
316 |
|
317 |
|
318 |
|
319 $ cd .. |
|
320 |
|