# HG changeset patch # User Augie Fackler # Date 1480297492 18000 # Node ID 64b55bffc1c059eb4c11ca195b561ca8a287f59e # Parent 342d0cb4f446826169a83a6e773f1c767e0c977b# Parent 819f96b82fa4c4c6d07840a2b180d112b524103f merge with stable diff -r 342d0cb4f446 -r 64b55bffc1c0 hgext/shelve.py --- a/hgext/shelve.py Fri Nov 25 09:59:39 2016 -0800 +++ b/hgext/shelve.py Sun Nov 27 20:44:52 2016 -0500 @@ -911,7 +911,7 @@ 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 -r 342d0cb4f446 -r 64b55bffc1c0 i18n/ja.po --- a/i18n/ja.po Fri Nov 25 09:59:39 2016 -0800 +++ b/i18n/ja.po Sun Nov 27 20:44:52 2016 -0500 @@ -10464,7 +10464,7 @@ " 指定対象の変更のみが退避されます。" 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 -r 342d0cb4f446 -r 64b55bffc1c0 i18n/pt_BR.po --- a/i18n/pt_BR.po Fri Nov 25 09:59:39 2016 -0800 +++ b/i18n/pt_BR.po Sun Nov 27 20:44:52 2016 -0500 @@ -10582,7 +10582,7 @@ " 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 -r 342d0cb4f446 -r 64b55bffc1c0 tests/test-shelve.t --- a/tests/test-shelve.t Fri Nov 25 09:59:39 2016 -0800 +++ b/tests/test-shelve.t Sun Nov 27 20:44:52 2016 -0500 @@ -36,7 +36,7 @@ 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