Mercurial > public > mercurial-scm > hg-stable

diff tests/test-subrepo.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 5e10d41e7b9c
children 4c96c50ef937
line wrap: on
line diff
--- a/tests/test-subrepo.t	Sat Oct 05 01:02:22 2013 +0900
+++ b/tests/test-subrepo.t	Thu Oct 03 23:16:06 2013 +0900
@@ -317,7 +317,7 @@
   pushing subrepo s to $TESTTMP/t/s
   searching for changes
   abort: push creates new remote head 12a213df6fa9! (in subrepo s)
-  (did you forget to merge? use push -f to force)
+  (merge or see "hg help push" for details about pushing new heads)
   [255]
   $ hg push -f
   pushing to $TESTTMP/t (glob)
@@ -716,7 +716,7 @@
   $ hg -R repo2 ci -m3
   $ hg -q -R repo2 push
   abort: push creates new remote head cc505f09a8b2! (in subrepo s)
-  (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 repo update
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved