Mercurial > hg
comparison tests/test-rebase-inmemory.t @ 45150:dc5e5577af39
error: unify the error message formats for 'rebase' and 'unshelve'
Differential Revision: https://phab.mercurial-scm.org/D8730
| author | Daniel Ploch <dploch@google.com> |
|---|---|
| date | Mon, 13 Jul 2020 16:42:44 -0700 |
| parents | 0ecb3b11fcad |
| children | a253ded5b03d 0ea08126a2af |
comparison
equal
deleted
inserted
replaced
| 45149:87047efbc6a6 | 45150:dc5e5577af39 |
|---|---|
| 469 rebasing 2:177f92b77385 "c" | 469 rebasing 2:177f92b77385 "c" |
| 470 rebasing 3:055a42cdd887 "d" | 470 rebasing 3:055a42cdd887 "d" |
| 471 rebasing 4:e860deea161a "e" | 471 rebasing 4:e860deea161a "e" |
| 472 merging e | 472 merging e |
| 473 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') | 473 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
| 474 unresolved conflicts (see hg resolve, then hg rebase --continue) | 474 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
| 475 [1] | 475 [1] |
| 476 $ hg rebase --abort | 476 $ hg rebase --abort |
| 477 saved backup bundle to $TESTTMP/repo3/.hg/strip-backup/c1e524d4287c-f91f82e1-backup.hg | 477 saved backup bundle to $TESTTMP/repo3/.hg/strip-backup/c1e524d4287c-f91f82e1-backup.hg |
| 478 rebase aborted | 478 rebase aborted |
| 479 | 479 |
| 861 merging foo | 861 merging foo |
| 862 hit merge conflicts; re-running rebase without in-memory merge | 862 hit merge conflicts; re-running rebase without in-memory merge |
| 863 rebasing 2:fb62b706688e "add b to foo" (tip) | 863 rebasing 2:fb62b706688e "add b to foo" (tip) |
| 864 merging foo | 864 merging foo |
| 865 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') | 865 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') |
| 866 unresolved conflicts (see hg resolve, then hg rebase --continue) | 866 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
| 867 [1] | 867 [1] |
| 868 | 868 |
| 869 $ cd $TESTTMP | 869 $ cd $TESTTMP |
| 870 | 870 |
| 871 Test rebasing when we're in the middle of a rebase already | 871 Test rebasing when we're in the middle of a rebase already |
| 895 merging foo | 895 merging foo |
| 896 hit merge conflicts; re-running rebase without in-memory merge | 896 hit merge conflicts; re-running rebase without in-memory merge |
| 897 rebasing 2:b4d249fbf8dd "bye from foo" | 897 rebasing 2:b4d249fbf8dd "bye from foo" |
| 898 merging foo | 898 merging foo |
| 899 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') | 899 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') |
| 900 unresolved conflicts (see hg resolve, then hg rebase --continue) | 900 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
| 901 [1] | 901 [1] |
| 902 $ hg rebase -r 3 -d 1 -t:merge3 | 902 $ hg rebase -r 3 -d 1 -t:merge3 |
| 903 abort: rebase in progress | 903 abort: rebase in progress |
| 904 (use 'hg rebase --continue' or 'hg rebase --abort') | 904 (use 'hg rebase --continue' or 'hg rebase --abort') |
| 905 [255] | 905 [255] |