98 (no more unresolved files) |
98 (no more unresolved files) |
99 continue: hg rebase --continue |
99 continue: hg rebase --continue |
100 $ hg rebase --continue |
100 $ hg rebase --continue |
101 already rebased 3:3163e20567cc "L1" as 3e046f2ecedb |
101 already rebased 3:3163e20567cc "L1" as 3e046f2ecedb |
102 rebasing 4:46f0b057b5c0 "L2" |
102 rebasing 4:46f0b057b5c0 "L2" |
103 rebasing 5:8029388f38dc "L3" (mybook) |
103 rebasing 5:8029388f38dc mybook "L3" |
104 saved backup bundle to $TESTTMP/a/.hg/strip-backup/3163e20567cc-5ca4656e-rebase.hg |
104 saved backup bundle to $TESTTMP/a/.hg/strip-backup/3163e20567cc-5ca4656e-rebase.hg |
105 |
105 |
106 $ hg tglog |
106 $ hg tglog |
107 @ 5:secret 'L3' mybook |
107 @ 5:secret 'L3' mybook |
108 | |
108 | |
259 committing manifest |
259 committing manifest |
260 committing changelog |
260 committing changelog |
261 updating the branch cache |
261 updating the branch cache |
262 rebased as 19c888675e13 |
262 rebased as 19c888675e13 |
263 rebase status stored |
263 rebase status stored |
264 rebasing 10:2f2496ddf49d "merge" (tip) |
264 rebasing 10:2f2496ddf49d tip "merge" |
265 future parents are 11 and 7 |
265 future parents are 11 and 7 |
266 already in destination |
266 already in destination |
267 merge against 10:2f2496ddf49d |
267 merge against 10:2f2496ddf49d |
268 detach base 9:e31216eec445 |
268 detach base 9:e31216eec445 |
269 resolving manifests |
269 resolving manifests |
339 $ hg up -q '.^' |
339 $ hg up -q '.^' |
340 $ echo b >> a |
340 $ echo b >> a |
341 $ echo c >> a |
341 $ echo c >> a |
342 $ hg commit -q -m 'abc' |
342 $ hg commit -q -m 'abc' |
343 $ hg rebase -s 7bc217434fc1 -d ab --keep |
343 $ hg rebase -s 7bc217434fc1 -d ab --keep |
344 rebasing 13:7bc217434fc1 "abc" (tip) |
344 rebasing 13:7bc217434fc1 tip "abc" |
345 merging a |
345 merging a |
346 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
346 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
347 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
347 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
348 [1] |
348 [1] |
349 $ hg diff |
349 $ hg diff |
359 +>>>>>>> source: 7bc217434fc1 - test: abc |
359 +>>>>>>> source: 7bc217434fc1 - test: abc |
360 $ hg rebase --abort |
360 $ hg rebase --abort |
361 rebase aborted |
361 rebase aborted |
362 $ hg up -q -C 7bc217434fc1 |
362 $ hg up -q -C 7bc217434fc1 |
363 $ hg rebase -s . -d ab --keep -t internal:merge3 |
363 $ hg rebase -s . -d ab --keep -t internal:merge3 |
364 rebasing 13:7bc217434fc1 "abc" (tip) |
364 rebasing 13:7bc217434fc1 tip "abc" |
365 merging a |
365 merging a |
366 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
366 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
367 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
367 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
368 [1] |
368 [1] |
369 $ hg diff |
369 $ hg diff |
397 |
397 |
398 $ hg update E -q |
398 $ hg update E -q |
399 $ echo 3 > B |
399 $ echo 3 > B |
400 $ hg commit --amend -m E -A B -q |
400 $ hg commit --amend -m E -A B -q |
401 $ hg rebase -r B+D -d . --config experimental.evolution=true |
401 $ hg rebase -r B+D -d . --config experimental.evolution=true |
402 rebasing 1:112478962961 "B" (B) |
402 rebasing 1:112478962961 B "B" |
403 merging B |
403 merging B |
404 warning: conflicts while merging B! (edit, then use 'hg resolve --mark') |
404 warning: conflicts while merging B! (edit, then use 'hg resolve --mark') |
405 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
405 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
406 [1] |
406 [1] |
407 |
407 |
408 $ echo 4 > B |
408 $ echo 4 > B |
409 $ hg resolve -m |
409 $ hg resolve -m |
410 (no more unresolved files) |
410 (no more unresolved files) |
411 continue: hg rebase --continue |
411 continue: hg rebase --continue |
412 $ hg rebase --continue --config experimental.evolution=none |
412 $ hg rebase --continue --config experimental.evolution=none |
413 rebasing 1:112478962961 "B" (B) |
413 rebasing 1:112478962961 B "B" |
414 rebasing 3:f585351a92f8 "D" (D) |
414 rebasing 3:f585351a92f8 D "D" |
415 warning: orphaned descendants detected, not stripping 112478962961 |
415 warning: orphaned descendants detected, not stripping 112478962961 |
416 saved backup bundle to $TESTTMP/b/.hg/strip-backup/f585351a92f8-e536a9e4-rebase.hg |
416 saved backup bundle to $TESTTMP/b/.hg/strip-backup/f585351a92f8-e536a9e4-rebase.hg |
417 |
417 |
418 $ rm .hg/localtags |
418 $ rm .hg/localtags |
419 $ hg tglog |
419 $ hg tglog |
446 > EOS |
446 > EOS |
447 |
447 |
448 $ hg co F |
448 $ hg co F |
449 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
449 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
450 $ hg rebase -d B |
450 $ hg rebase -d B |
451 rebasing 2:dc0947a82db8 "C" (C) |
451 rebasing 2:dc0947a82db8 C "C" |
452 rebasing 3:e7b3f00ed42e "D" (D) |
452 rebasing 3:e7b3f00ed42e D "D" |
453 rebasing 4:03ca77807e91 "E" (E) |
453 rebasing 4:03ca77807e91 E "E" |
454 rebasing 5:9a6b91dc2044 "F" (F tip) |
454 rebasing 5:9a6b91dc2044 F tip "F" |
455 merging conflict |
455 merging conflict |
456 warning: conflicts while merging conflict! (edit, then use 'hg resolve --mark') |
456 warning: conflicts while merging conflict! (edit, then use 'hg resolve --mark') |
457 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
457 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
458 [1] |
458 [1] |
459 $ hg tglog |
459 $ hg tglog |
478 $ echo baz > conflict |
478 $ echo baz > conflict |
479 $ hg resolve -m |
479 $ hg resolve -m |
480 (no more unresolved files) |
480 (no more unresolved files) |
481 continue: hg rebase --continue |
481 continue: hg rebase --continue |
482 $ hg rebase -c |
482 $ hg rebase -c |
483 already rebased 2:dc0947a82db8 "C" (C) as 0199610c343e |
483 already rebased 2:dc0947a82db8 C "C" as 0199610c343e |
484 already rebased 3:e7b3f00ed42e "D" (D) as f0dd538aaa63 |
484 already rebased 3:e7b3f00ed42e D "D" as f0dd538aaa63 |
485 already rebased 4:03ca77807e91 "E" (E) as cbf25af8347d |
485 already rebased 4:03ca77807e91 E "E" as cbf25af8347d |
486 rebasing 5:9a6b91dc2044 "F" (F) |
486 rebasing 5:9a6b91dc2044 F "F" |
487 saved backup bundle to $TESTTMP/conflict-in-merge/.hg/strip-backup/dc0947a82db8-ca7e7d5b-rebase.hg |
487 saved backup bundle to $TESTTMP/conflict-in-merge/.hg/strip-backup/dc0947a82db8-ca7e7d5b-rebase.hg |
488 $ hg tglog |
488 $ hg tglog |
489 @ 5:draft 'F' |
489 @ 5:draft 'F' |
490 |\ |
490 |\ |
491 | o 4:draft 'E' |
491 | o 4:draft 'E' |