Mercurial > hg

diff mercurial/discovery.py @ 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 b00ba31313c3
children 8179eb28983b
line wrap: on
line diff
--- a/mercurial/discovery.py	Sat Oct 05 01:02:22 2013 +0900
+++ b/mercurial/discovery.py	Thu Oct 03 23:16:06 2013 +0900
@@ -330,11 +330,13 @@
                     error = _("push creates new remote head %s!"
                               ) % short(dhs[0])
                 if heads[2]: # unsynced
-                    hint = _("you should pull and merge or "
-                             "use push -f to force")
+                    hint = _("pull and merge or"
+                             " see \"hg help push\" for details about"
+                             " pushing new heads")
                 else:
-                    hint = _("did you forget to merge? "
-                             "use push -f to force")
+                    hint = _("merge or"
+                             " see \"hg help push\" for details about"
+                             " pushing new heads")
             if branch is not None:
                 repo.ui.note(_("new remote heads on branch '%s'\n") % branch)
             for h in dhs: