Mercurial > public > mercurial-scm > hg

diff tests/test-rebase-named-branches.t @ 43114:8197b395710e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
destutil: provide hint on rebase+merge for how to specify destination/rev Without a destination specified, rebase and merge attempt to identify a good candidate; this fails if there's too many heads, the heads have a bookmark, or other reasons. Complicating the issue, users may have specified -t, thinking it means target, and are confused when the error message says that they need to specify an explicit rev or explicit destination - they feel like they already have. Differential Revision: https://phab.mercurial-scm.org/D7024
author Kyle Lippincott <spectral@google.com>
date Tue, 08 Oct 2019 19:35:30 -0700
parents 4edd427f34c1
children 9f3aa0d3de41
line wrap: on
line diff
--- a/tests/test-rebase-named-branches.t	Tue Oct 08 10:40:36 2019 -0700
+++ b/tests/test-rebase-named-branches.t	Tue Oct 08 19:35:30 2019 -0700
@@ -374,7 +374,7 @@
   
   $ hg rebase
   abort: branch 'c' has one head - please rebase to an explicit rev
-  (run 'hg heads' to see all heads)
+  (run 'hg heads' to see all heads, specify destination with -d)
   [255]
   $ hg tglog
   _  4: 8427af5d86f2 'c2 closed' c