Mercurial > hg-stable

diff tests/test-bookmarks-pushpull.t @ 19934:bfc6ed892349

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
push: hide description about "-f" in the hint to prevent from using it easily "use push -f to force" in the hint at abortion of "hg push" may cause novice users to execute "push -f" easily without understanding about problems of multiple branch heads in the repository. This patch hides description about "-f" in the hint, and leads into seeing "hg help push" for details about pushing new heads.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Thu, 03 Oct 2013 23:16:06 +0900
parents 14c91b18d798
children a14d93b2fb1b
line wrap: on
line diff
--- a/tests/test-bookmarks-pushpull.t	Sat Oct 05 01:02:22 2013 +0900
+++ b/tests/test-bookmarks-pushpull.t	Thu Oct 03 23:16:06 2013 +0900
@@ -275,7 +275,7 @@
   pushing to http://localhost:$HGPORT2/
   searching for changes
   abort: push creates new remote head c922c0139ca0!
-  (did you forget to merge? use push -f to force)
+  (merge or see "hg help push" for details about pushing new heads)
   [255]
   $ hg -R ../a book
      @                         1:0d2164f0ce0d
@@ -291,7 +291,7 @@
   pushing to http://localhost:$HGPORT2/
   searching for changes
   abort: push creates new remote head c922c0139ca0!
-  (did you forget to merge? use push -f to force)
+  (merge or see "hg help push" for details about pushing new heads)
   [255]
   $ hg -R ../a book
      @                         1:0d2164f0ce0d