equal
deleted
inserted
replaced
463 merging e |
463 merging e |
464 hit merge conflicts; rebasing that commit again in the working copy |
464 hit merge conflicts; rebasing that commit again in the working copy |
465 merging e |
465 merging e |
466 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
466 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
467 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
467 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
468 [1] |
468 [240] |
469 $ hg rebase --abort |
469 $ hg rebase --abort |
470 saved backup bundle to $TESTTMP/repo3/.hg/strip-backup/c1e524d4287c-f91f82e1-backup.hg |
470 saved backup bundle to $TESTTMP/repo3/.hg/strip-backup/c1e524d4287c-f91f82e1-backup.hg |
471 rebase aborted |
471 rebase aborted |
472 |
472 |
473 Retrying without in-memory merge won't lose working copy changes |
473 Retrying without in-memory merge won't lose working copy changes |
854 merging foo |
854 merging foo |
855 hit merge conflicts; rebasing that commit again in the working copy |
855 hit merge conflicts; rebasing that commit again in the working copy |
856 merging foo |
856 merging foo |
857 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') |
857 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') |
858 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
858 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
859 [1] |
859 [240] |
860 |
860 |
861 $ cd $TESTTMP |
861 $ cd $TESTTMP |
862 |
862 |
863 Test rebasing when we're in the middle of a rebase already |
863 Test rebasing when we're in the middle of a rebase already |
864 $ hg init test_issue6214 |
864 $ hg init test_issue6214 |
887 merging foo |
887 merging foo |
888 hit merge conflicts; rebasing that commit again in the working copy |
888 hit merge conflicts; rebasing that commit again in the working copy |
889 merging foo |
889 merging foo |
890 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') |
890 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') |
891 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
891 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
892 [1] |
892 [240] |
893 $ hg rebase -r 3 -d 1 -t:merge3 |
893 $ hg rebase -r 3 -d 1 -t:merge3 |
894 abort: rebase in progress |
894 abort: rebase in progress |
895 (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') |
895 (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') |
896 [255] |
896 [255] |
897 $ hg resolve --list |
897 $ hg resolve --list |