Mercurial > hg
changeset 48980:6e7ae547e38d stable
pullbundle: fix file name in the help text
It is pullbundles.manifest and not pullbundle.manifest.
Differential Revision: https://phab.mercurial-scm.org/D12391
| author | Joerg Sonnenberger <joerg@bec.de> |
|---|---|
| date | Tue, 22 Mar 2022 03:19:01 +0100 |
| parents | 9120c0cd935c |
| children | 533820f5b997 9bb700223f00 |
| files | i18n/ja.po i18n/pt_BR.po mercurial/helptext/config.txt tests/test-pull-bundle.t |
| diffstat | 4 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/i18n/ja.po Mon Mar 21 14:21:10 2022 -0700 +++ b/i18n/ja.po Tue Mar 22 03:19:01 2022 +0100 @@ -26642,7 +26642,7 @@ msgid "" "``pullbundle``\n" -" When set, the server will check pullbundle.manifest for bundles\n" +" When set, the server will check pullbundles.manifest for bundles\n" " covering the requested heads and common nodes. The first matching\n" " entry will be streamed to the client." msgstr ""
--- a/i18n/pt_BR.po Mon Mar 21 14:21:10 2022 -0700 +++ b/i18n/pt_BR.po Tue Mar 22 03:19:01 2022 +0100 @@ -27460,12 +27460,12 @@ msgid "" "``pullbundle``\n" -" When set, the server will check pullbundle.manifest for bundles\n" +" When set, the server will check pullbundles.manifest for bundles\n" " covering the requested heads and common nodes. The first matching\n" " entry will be streamed to the client." msgstr "" "``pullbundle``\n" -" Se definido, o servidor verificará pullbundle.manifest para\n" +" Se definido, o servidor verificará pullbundles.manifest para\n" " arquivos de bundle que contiverem as cabeças e nós comuns\n" " pedidos. A primeira entrada correspondente será enviadas para\n" " o cliente."
--- a/mercurial/helptext/config.txt Mon Mar 21 14:21:10 2022 -0700 +++ b/mercurial/helptext/config.txt Tue Mar 22 03:19:01 2022 +0100 @@ -2293,7 +2293,7 @@ effectively prevents concurrent pushes. ``pullbundle`` - When set, the server will check pullbundle.manifest for bundles + When set, the server will check pullbundles.manifest for bundles covering the requested heads and common nodes. The first matching entry will be streamed to the client.
--- a/tests/test-pull-bundle.t Mon Mar 21 14:21:10 2022 -0700 +++ b/tests/test-pull-bundle.t Tue Mar 22 03:19:01 2022 +0100 @@ -194,7 +194,7 @@ * sending pullbundle "0.hg" (glob) $ rm repo/.hg/blackbox.log -Test processing when nodes used in the pullbundle.manifest end up being hidden +Test processing when nodes used in the pullbundles.manifest end up being hidden $ hg --repo repo debugobsolete ed1b79f46b9a29f5a6efa59cf12fcfca43bead5a 1 new obsolescence markers