Patchwork [3,of,3,V4] discovery: revise hint message introduced by changeset b00ba31313c3

login
register
mail settings
Submitter Katsunori FUJIWARA
Date Oct. 3, 2013, 2:53 p.m.
Message ID <85dda47dac3032539108.1380812026@juju>
Download mbox | patch
Permalink /patch/2728/
State Accepted
Commit 8179eb28983b398b100e0679d0e6d5f89f0796e7
Headers show

Comments

Katsunori FUJIWARA - Oct. 3, 2013, 2:53 p.m.
# HG changeset patch
# User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
# Date 1380809767 -32400
#      Thu Oct 03 23:16:07 2013 +0900
# Node ID 85dda47dac3032539108716f59c3e94ce0f99346
# Parent  49339a7e52914e9abbedcfce4f1906f6997dc0c8
discovery: revise hint message introduced by changeset b00ba31313c3

This patch revises hint message from "for detail about" introduced by
changeset b00ba31313c3 to "for details about", to unify it with the
hint message introduced by proceeding patch.

Patch

diff --git a/mercurial/discovery.py b/mercurial/discovery.py
--- a/mercurial/discovery.py
+++ b/mercurial/discovery.py
@@ -316,7 +316,7 @@ 
                     error = (_("push creates multiple headed new branch '%s'")
                              % (branch))
                     hint = _("merge or"
-                             " see \"hg help push\" for detail about"
+                             " see \"hg help push\" for details about"
                              " pushing new heads")
         elif len(newhs) > len(oldhs):
             # strip updates to existing remote heads from the new heads list
diff --git a/tests/test-push-warn.t b/tests/test-push-warn.t
--- a/tests/test-push-warn.t
+++ b/tests/test-push-warn.t
@@ -368,7 +368,7 @@ 
   pushing to ../f
   searching for changes
   abort: push creates multiple headed new branch 'f'
-  (merge or see "hg help push" for detail about pushing new heads)
+  (merge or see "hg help push" for details about pushing new heads)
   [255]
   $ hg push --branch f --new-branch --force ../f
   pushing to ../f