equal
deleted
inserted
replaced
303 |/ |
303 |/ |
304 o 0: 'A' |
304 o 0: 'A' |
305 |
305 |
306 $ cd .. |
306 $ cd .. |
307 |
307 |
|
308 Verify that target is not selected as external rev (issue3085) |
|
309 |
|
310 $ hg clone -q -U a a6 |
|
311 $ cd a6 |
|
312 $ hg up -q 6 |
|
313 |
|
314 $ echo "I" >> E |
|
315 $ hg ci -m "I" |
|
316 $ hg merge 7 |
|
317 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
318 (branch merge, don't forget to commit) |
|
319 $ hg ci -m "Merge" |
|
320 $ echo "J" >> F |
|
321 $ hg ci -m "J" |
|
322 |
|
323 $ hg rebase -s 8 -d 7 --collapse --detach --config ui.merge=internal:other |
|
324 remote changed E which local deleted |
|
325 use (c)hanged version or leave (d)eleted? c |
|
326 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/*-backup.hg (glob) |
|
327 |
|
328 $ hg tglog |
|
329 @ 8: 'Collapsed revision |
|
330 | * I |
|
331 | * Merge |
|
332 | * J' |
|
333 o 7: 'H' |
|
334 | |
|
335 | o 6: 'G' |
|
336 |/| |
|
337 o | 5: 'F' |
|
338 | | |
|
339 | o 4: 'E' |
|
340 |/ |
|
341 | o 3: 'D' |
|
342 | | |
|
343 | o 2: 'C' |
|
344 | | |
|
345 | o 1: 'B' |
|
346 |/ |
|
347 o 0: 'A' |
|
348 |
|
349 |
|
350 $ hg parents |
|
351 changeset: 8:9472f4b1d736 |
|
352 tag: tip |
|
353 user: test |
|
354 date: Thu Jan 01 00:00:00 1970 +0000 |
|
355 summary: Collapsed revision |
|
356 |
|
357 |
|
358 $ cd .. |
|
359 |
308 Ensure --continue restores a correct state (issue3046): |
360 Ensure --continue restores a correct state (issue3046): |
309 $ hg clone -q a a6 |
361 $ hg clone -q a a7 |
310 $ cd a6 |
362 $ cd a7 |
311 $ hg up -q 3 |
363 $ hg up -q 3 |
312 $ echo 'H2' > H |
364 $ echo 'H2' > H |
313 $ hg ci -A -m 'H2' |
365 $ hg ci -A -m 'H2' |
314 adding H |
366 adding H |
315 $ hg rebase -s 8 -d 7 --detach --config ui.merge=internal:fail |
367 $ hg rebase -s 8 -d 7 --detach --config ui.merge=internal:fail |
318 merging H failed! |
370 merging H failed! |
319 abort: unresolved conflicts (see hg resolve, then hg rebase --continue) |
371 abort: unresolved conflicts (see hg resolve, then hg rebase --continue) |
320 [255] |
372 [255] |
321 $ hg resolve --all -t internal:local |
373 $ hg resolve --all -t internal:local |
322 $ hg rebase -c |
374 $ hg rebase -c |
323 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/6215fafa5447-backup.hg |
375 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-backup.hg |
324 $ hg tglog |
376 $ hg tglog |
325 @ 8: 'H2' |
377 @ 8: 'H2' |
326 | |
378 | |
327 o 7: 'H' |
379 o 7: 'H' |
328 | |
380 | |