diff --git a/i18n/ja.po b/i18n/ja.po --- a/i18n/ja.po +++ b/i18n/ja.po @@ -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 "" diff --git a/i18n/pt_BR.po b/i18n/pt_BR.po --- a/i18n/pt_BR.po +++ b/i18n/pt_BR.po @@ -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." diff --git a/mercurial/helptext/config.txt b/mercurial/helptext/config.txt --- a/mercurial/helptext/config.txt +++ b/mercurial/helptext/config.txt @@ -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. diff --git a/tests/test-pull-bundle.t b/tests/test-pull-bundle.t --- a/tests/test-pull-bundle.t +++ b/tests/test-pull-bundle.t @@ -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