equal
deleted
inserted
replaced
180 $ cd .. |
180 $ cd .. |
181 |
181 |
182 =============================================================================== |
182 =============================================================================== |
183 Test instability resolution for a changeset unstable because its parent |
183 Test instability resolution for a changeset unstable because its parent |
184 is obsolete with multiple successors all in one chain (simple split) |
184 is obsolete with multiple successors all in one chain (simple split) |
185 Not supported yet |
|
186 ============================================================================== |
185 ============================================================================== |
187 |
186 |
188 $ hg init test4 |
187 $ hg init test4 |
189 $ cd test4 |
188 $ cd test4 |
190 $ mkcommits _a _b _c |
189 $ mkcommits _a _b _c |
206 |/ |
205 |/ |
207 o 0:135f39f4bd78@default(draft) add _a |
206 o 0:135f39f4bd78@default(draft) add _a |
208 |
207 |
209 |
208 |
210 $ hg evo --all --any --unstable |
209 $ hg evo --all --any --unstable |
211 does not handle split parents yet |
210 move:[2] add _c |
212 $ hg log -G |
211 atop:[4] add bprimesplit2 |
213 @ 4:2a4ccc0bb20c@default(draft) add bprimesplit2 |
212 working directory is now at 387cc1e837d7 |
|
213 $ hg log -G |
|
214 @ 5:387cc1e837d7@default(draft) add _c |
|
215 | |
|
216 o 4:2a4ccc0bb20c@default(draft) add bprimesplit2 |
214 | |
217 | |
215 o 3:8b87864bd0f4@default(draft) add bprimesplit1 |
218 o 3:8b87864bd0f4@default(draft) add bprimesplit1 |
216 | |
219 | |
217 | o 2:102002290587@default(draft) add _c |
|
218 | | |
|
219 | x 1:37445b16603b@default(draft) add _b |
|
220 |/ |
|
221 o 0:135f39f4bd78@default(draft) add _a |
220 o 0:135f39f4bd78@default(draft) add _a |
222 |
221 |
223 |
222 |
224 |
223 |
225 $ cd .. |
224 $ cd .. |
226 |
225 |
227 =============================================================================== |
226 =============================================================================== |
228 Test instability resolution for a changeset unstable because its parent |
227 Test instability resolution for a changeset unstable because its parent |
229 is obsolete with multiple successors on one branches but in reverse |
228 is obsolete with multiple successors on one branches but in reverse |
230 order (cross-split). |
229 order (cross-split). |
231 Not supported yet |
|
232 ============================================================================== |
230 ============================================================================== |
233 |
231 |
234 $ hg init test5 |
232 $ hg init test5 |
235 $ cd test5 |
233 $ cd test5 |
236 $ mkcommits _a _b _c |
234 $ mkcommits _a _b _c |
261 |/ |
259 |/ |
262 o 0:135f39f4bd78@default(draft) add _a |
260 o 0:135f39f4bd78@default(draft) add _a |
263 |
261 |
264 |
262 |
265 $ hg evo --all --any --unstable |
263 $ hg evo --all --any --unstable |
266 does not handle split parents yet |
264 move:[2] add _c |
267 $ hg log -G |
265 atop:[6] add bsecondsplit2 |
268 @ 6:59b942dbda14@default(draft) add bsecondsplit2 |
266 working directory is now at 98e3f21461ff |
|
267 $ hg log -G |
|
268 @ 7:98e3f21461ff@default(draft) add _c |
|
269 | |
|
270 o 6:59b942dbda14@default(draft) add bsecondsplit2 |
269 | |
271 | |
270 o 5:8ffdae67d696@default(draft) add bsecondsplit1 |
272 o 5:8ffdae67d696@default(draft) add bsecondsplit1 |
271 | |
273 | |
272 | o 2:102002290587@default(draft) add _c |
|
273 | | |
|
274 | x 1:37445b16603b@default(draft) add _b |
|
275 |/ |
|
276 o 0:135f39f4bd78@default(draft) add _a |
274 o 0:135f39f4bd78@default(draft) add _a |
277 |
275 |
278 |
276 |
279 |
277 |
280 $ cd .. |
278 $ cd .. |
310 |/ |
308 |/ |
311 o 0:135f39f4bd78@default(draft) add _a |
309 o 0:135f39f4bd78@default(draft) add _a |
312 |
310 |
313 |
311 |
314 $ hg evo --all --any --unstable |
312 $ hg evo --all --any --unstable |
315 does not handle split parents yet |
313 cannot solve split accross two branches |
316 $ hg log -G |
314 $ hg log -G |
317 @ 4:3c69ea6aa93e@default(draft) add bprimesplit2 |
315 @ 4:3c69ea6aa93e@default(draft) add bprimesplit2 |
318 | |
316 | |
319 | o 3:8b87864bd0f4@default(draft) add bprimesplit1 |
317 | o 3:8b87864bd0f4@default(draft) add bprimesplit1 |
320 |/ |
318 |/ |