Mercurial > public > mercurial-scm > hg

diff tests/test-rebase-dest.t @ 31733:ae6bab095c66

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: abort hg pull --rebase if rebase.requiredest is set (issue5514) Previously, the pull would succeed, but the subsequent rebase would fail due to the rebase.requiredest flag. Now abort earlier with a more useful error message.
author Ryan McElroy <rmcelroy@fb.com>
date Thu, 30 Mar 2017 03:50:10 -0700
parents 9ddf875183b0
children 3b7cb3d17137
line wrap: on
line diff
--- a/tests/test-rebase-dest.t	Thu Mar 30 03:50:10 2017 -0700
+++ b/tests/test-rebase-dest.t	Thu Mar 30 03:50:10 2017 -0700
@@ -72,13 +72,7 @@
   $ echo f > f
   $ hg commit -qAm ff
   $ hg pull --rebase
-  pulling from $TESTTMP/repo
-  searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 1 changesets with 2 changes to 2 files (+1 heads)
-  abort: you must specify a destination
-  (use: hg rebase -d REV)
+  abort: rebase destination required by configuration
+  (use hg pull followed by hg rebase -d DEST)
   [255]