Mercurial > hg
diff tests/test-rebase-obsolete.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 | 9c9cfecd4600 |
| children | a253ded5b03d aaeccdb6e654 |
line wrap: on
line diff
--- a/tests/test-rebase-obsolete.t Wed Apr 01 08:42:00 2020 -0500 +++ b/tests/test-rebase-obsolete.t Mon Jul 13 16:42:44 2020 -0700 @@ -1032,7 +1032,7 @@ rebasing 19:b82fb57ea638 "willconflict second version" merging willconflict warning: conflicts while merging willconflict! (edit, then use 'hg resolve --mark') - unresolved conflicts (see hg resolve, then hg rebase --continue) + unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') [1] $ hg resolve --mark willconflict @@ -1787,7 +1787,7 @@ rebasing 1:2ec65233581b "B" merging D warning: conflicts while merging D! (edit, then use 'hg resolve --mark') - unresolved conflicts (see hg resolve, then hg rebase --continue) + unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') [1] $ cp -R . $TESTTMP/hidden-state2 @@ -1872,7 +1872,7 @@ rebasing 3:055a42cdd887 "d" merging d warning: conflicts while merging d! (edit, then use 'hg resolve --mark') - unresolved conflicts (see hg resolve, then hg rebase --continue) + unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') [1] $ hg rebase --stop 1 new orphan changesets @@ -1934,7 +1934,7 @@ rebasing 3:055a42cdd887 "d" merging d warning: conflicts while merging d! (edit, then use 'hg resolve --mark') - unresolved conflicts (see hg resolve, then hg rebase --continue) + unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') [1] $ hg rebase --stop abort: cannot remove original changesets with unrebased descendants @@ -1952,7 +1952,7 @@ rebasing 3:055a42cdd887 "d" merging d warning: conflicts while merging d! (edit, then use 'hg resolve --mark') - unresolved conflicts (see hg resolve, then hg rebase --continue) + unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') [1] $ hg rebase --stop $ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n" @@ -2014,7 +2014,7 @@ rebasing 3:055a42cdd887 "d" merging d warning: conflicts while merging d! (edit, then use 'hg resolve --mark') - unresolved conflicts (see hg resolve, then hg rebase --continue) + unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') [1] $ hg rebase --stop abort: cannot stop in --collapse session @@ -2047,7 +2047,7 @@ rebasing 3:055a42cdd887 "d" merging d warning: conflicts while merging d! (edit, then use 'hg resolve --mark') - unresolved conflicts (see hg resolve, then hg rebase --continue) + unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') [1] $ hg rebase --stop --dry-run abort: cannot specify both --stop and --dry-run @@ -2115,7 +2115,7 @@ rebasing 3:67a385d4e6f2 "D" (Z) merging d warning: conflicts while merging d! (edit, then use 'hg resolve --mark') - unresolved conflicts (see hg resolve, then hg rebase --continue) + unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') [1] $ hg rebase --stop 1 new orphan changesets