Mercurial > hg-stable

diff tests/test-rebase-scenario-global.t @ 33810:19f495fef0a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: change "result would have 3 parent" error message (BC) The old error message "cannot use revision REV as base, result would have 3 parents" is confusing - why use REV as base? why add a new parent?. This patch changes it to "cannot move parent", which seems better. Differential Revision: https://phab.mercurial-scm.org/D342
author Jun Wu <quark@fb.com>
date Sat, 12 Aug 2017 21:01:06 -0700
parents 6c1a9fd8361b
children 32528419db64
line wrap: on
line diff
--- a/tests/test-rebase-scenario-global.t	Mon Aug 14 07:02:38 2017 -0700
+++ b/tests/test-rebase-scenario-global.t	Sat Aug 12 21:01:06 2017 -0700
@@ -271,7 +271,7 @@
 
   $ hg rebase -s 6 -d 1
   rebasing 6:eea13746799a "G"
-  abort: cannot use revision 6 as base, result would have 3 parents
+  abort: cannot rebase 6:eea13746799a without moving at least one of its parents
   [255]
   $ hg rebase --abort
   rebase aborted