[PATCH stable,v2] shelve: add missing space in help text

Mads Kiilerich mads at kiilerich.com
Thu Nov 17 18:35:03 UTC 2016


# HG changeset patch
# User Mads Kiilerich <madski at unity3d.com>
# Date 1479159805 -3600
#      Mon Nov 14 22:43:25 2016 +0100
# Node ID 543c83999f3e1b0f8f62e5f2150b48bc47d55b0c
# Parent  73b671fbed41d82a5dd46e485c61ddb8afe42faf
shelve: add missing space in help text

The change is trivial and unlikely to have been translated so we update
translation files too.

diff --git a/hgext/shelve.py b/hgext/shelve.py
--- a/hgext/shelve.py
+++ b/hgext/shelve.py
@@ -882,7 +882,7 @@ def shelvecmd(ui, repo, *pats, **opts):
     files. If specific files or directories are named, only changes to
     those files are shelved.
 
-    In bare shelve(when no files are specified, without interactive,
+    In bare shelve (when no files are specified, without interactive,
     include and exclude option), shelving remembers information if the
     working directory was on newly created branch, in other words working
     directory was on different branch than its first parent. In this
diff --git a/i18n/ja.po b/i18n/ja.po
--- a/i18n/ja.po
+++ b/i18n/ja.po
@@ -10464,7 +10464,7 @@ msgstr ""
 "    指定対象の変更のみが退避されます。"
 
 msgid ""
-"    In bare shelve(when no files are specified, without interactive,\n"
+"    In bare shelve (when no files are specified, without interactive,\n"
 "    include and exclude option), shelving remembers information if the\n"
 "    working directory was on newly created branch, in other words working\n"
 "    directory was on different branch than its first parent. In this\n"
diff --git a/i18n/pt_BR.po b/i18n/pt_BR.po
--- a/i18n/pt_BR.po
+++ b/i18n/pt_BR.po
@@ -10582,7 +10582,7 @@ msgstr ""
 "    engavetadas."
 
 msgid ""
-"    In bare shelve(when no files are specified, without interactive,\n"
+"    In bare shelve (when no files are specified, without interactive,\n"
 "    include and exclude option), shelving remembers information if the\n"
 "    working directory was on newly created branch, in other words working\n"
 "    directory was on different branch than its first parent. In this\n"
diff --git a/tests/test-shelve.t b/tests/test-shelve.t
--- a/tests/test-shelve.t
+++ b/tests/test-shelve.t
@@ -36,7 +36,7 @@ shelve has a help message
       specific files or directories are named, only changes to those files are
       shelved.
   
-      In bare shelve(when no files are specified, without interactive, include
+      In bare shelve (when no files are specified, without interactive, include
       and exclude option), shelving remembers information if the working
       directory was on newly created branch, in other words working directory
       was on different branch than its first parent. In this situation


More information about the Mercurial-devel mailing list