This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6483

help: remove repeated word in 'hg help rebase'
ClosedPublic

Authored by amalloy on Jun 5 2019, 6:20 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG1314c0bb6b24: help: remove repeated word in 'hg help rebase'
Summary

Specifically, the second 'with' in 'with which to merge with'.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

amalloy created this revision.Jun 5 2019, 6:20 PM
martinvonz added a subscriber: martinvonz.Jun 6 2019, 1:15 AM

I'm pretty sure you should not change it in the i18n/ directory; I think those are updated by the translators for each language. I'll take this patch and I'll remove all the i18n changes.

durin42 added a subscriber: durin42.Jun 12 2019, 12:21 PM
In D6483#94130, @martinvonz wrote:

I'm pretty sure you should not change it in the i18n/ directory; I think those are updated by the translators for each language. I'll take this patch and I'll remove all the i18n changes.

Yep, that's correct. I'll take the patch that way, thanks.

amalloy added a commit: rHG1314c0bb6b24: help: remove repeated word in 'hg help rebase'.Jun 12 2019, 12:45 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG1314c0bb6b24: help: remove repeated word in 'hg help rebase' (authored by amalloy). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mi18n/da.po (2 lines)
Mi18n/de.po (2 lines)
Mi18n/el.po (2 lines)
Mi18n/fr.po (2 lines)
Mi18n/it.po (2 lines)
Mi18n/ja.po (2 lines)
Mi18n/pt_BR.po (2 lines)
Mi18n/ro.po (2 lines)
Mi18n/ru.po (2 lines)
Mi18n/sv.po (2 lines)
Mi18n/zh_CN.po (2 lines)
Mi18n/zh_TW.po (2 lines)
Mmercurial/commands.py (2 lines)

Diff 15351

i18n/da.po

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
" merges. It overrides the HGMERGE environment variable and your\n" " merges. It overrides the HGMERGE environment variable and your\n"
" configuration files. See :hg:`help merge-tools` for options." " configuration files. See :hg:`help merge-tools` for options."
msgstr "" msgstr ""
msgid "" msgid ""
" If no revision is specified, the working directory's parent is a\n" " If no revision is specified, the working directory's parent is a\n"
" head revision, and the current branch contains exactly one other\n" " head revision, and the current branch contains exactly one other\n"
" head, the other head is merged with by default. Otherwise, an\n" " head, the other head is merged with by default. Otherwise, an\n"
" explicit revision with which to merge with must be provided." " explicit revision with which to merge must be provided."
msgstr "" msgstr ""
" Hvis ingen revision angives og arbejdskatalogets forælder er en\n" " Hvis ingen revision angives og arbejdskatalogets forælder er en\n"
" hovedrevision og den nuværende gren indeholder præcis et andet\n" " hovedrevision og den nuværende gren indeholder præcis et andet\n"
" hoved, så sammenføjes der med dette hoved som standard. Ellers\n" " hoved, så sammenføjes der med dette hoved som standard. Ellers\n"
" skal en eksplicit revision angives." " skal en eksplicit revision angives."
msgid " :hg:`resolve` must be used to resolve unresolved files." msgid " :hg:`resolve` must be used to resolve unresolved files."
msgstr "" msgstr ""

i18n/de.po

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
" merges. It overrides the HGMERGE environment variable and your\n" " merges. It overrides the HGMERGE environment variable and your\n"
" configuration files. See :hg:`help merge-tools` for options." " configuration files. See :hg:`help merge-tools` for options."
msgstr "" msgstr ""
msgid "" msgid ""
" If no revision is specified, the working directory's parent is a\n" " If no revision is specified, the working directory's parent is a\n"
" head revision, and the current branch contains exactly one other\n" " head revision, and the current branch contains exactly one other\n"
" head, the other head is merged with by default. Otherwise, an\n" " head, the other head is merged with by default. Otherwise, an\n"
" explicit revision with which to merge with must be provided." " explicit revision with which to merge must be provided."
msgstr "" msgstr ""
" Wenn keine Revision angegeben wird und der Vorgänger des Arbeits-\n" " Wenn keine Revision angegeben wird und der Vorgänger des Arbeits-\n"
" verzeichnisses eine Kopfversion eines Zweiges mit genau zwei Köpfen " " verzeichnisses eine Kopfversion eines Zweiges mit genau zwei Köpfen "
"ist,\n" "ist,\n"
" dann wird der andere Kopf für die Zusammenführung verwendet.\n" " dann wird der andere Kopf für die Zusammenführung verwendet.\n"
" Bei mehr oder weniger als zwei Köpfen im Zweig muss eine andere " " Bei mehr oder weniger als zwei Köpfen im Zweig muss eine andere "
"Revision\n" "Revision\n"
" explizit angegeben werden." " explizit angegeben werden."

i18n/el.po

" updates to the repository are allowed. The next commit will have\n" " updates to the repository are allowed. The next commit will have\n"
" two parents." " two parents."
msgstr "" msgstr ""
msgid "" msgid ""
" If no revision is specified, the working directory's parent is a\n" " If no revision is specified, the working directory's parent is a\n"
" head revision, and the current branch contains exactly one other\n" " head revision, and the current branch contains exactly one other\n"
" head, the other head is merged with by default. Otherwise, an\n" " head, the other head is merged with by default. Otherwise, an\n"
" explicit revision with which to merge with must be provided.\n" " explicit revision with which to merge must be provided.\n"
" " " "
msgstr "" msgstr ""
#, python-format #, python-format
msgid "branch '%s' has %d heads - please merge with an explicit rev" msgid "branch '%s' has %d heads - please merge with an explicit rev"
msgstr "" msgstr ""
#, python-format #, python-format

i18n/fr.po

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
" updates to the repository are allowed. The next commit will have\n" " updates to the repository are allowed. The next commit will have\n"
" two parents." " two parents."
msgstr "" msgstr ""
msgid "" msgid ""
" If no revision is specified, the working directory's parent is a\n" " If no revision is specified, the working directory's parent is a\n"
" head revision, and the current branch contains exactly one other\n" " head revision, and the current branch contains exactly one other\n"
" head, the other head is merged with by default. Otherwise, an\n" " head, the other head is merged with by default. Otherwise, an\n"
" explicit revision with which to merge with must be provided.\n" " explicit revision with which to merge must be provided.\n"
" " " "
msgstr "" msgstr ""
#, python-format #, python-format
msgid "branch '%s' has %d heads - please merge with an explicit rev" msgid "branch '%s' has %d heads - please merge with an explicit rev"
msgstr "" msgstr ""
#, python-format #, python-format

i18n/it.po

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
" merges. It overrides the HGMERGE environment variable and your\n" " merges. It overrides the HGMERGE environment variable and your\n"
" configuration files." " configuration files."
msgstr "" msgstr ""
msgid "" msgid ""
" If no revision is specified, the working directory's parent is a\n" " If no revision is specified, the working directory's parent is a\n"
" head revision, and the current branch contains exactly one other\n" " head revision, and the current branch contains exactly one other\n"
" head, the other head is merged with by default. Otherwise, an\n" " head, the other head is merged with by default. Otherwise, an\n"
" explicit revision with which to merge with must be provided." " explicit revision with which to merge must be provided."
msgstr "" msgstr ""
msgid " :hg:`resolve` must be used to resolve unresolved files." msgid " :hg:`resolve` must be used to resolve unresolved files."
msgstr " :hg:`resolve` deve essere usato per decidere su file irrisolti." msgstr " :hg:`resolve` deve essere usato per decidere su file irrisolti."
msgid "" msgid ""
" To undo an uncommitted merge, use :hg:`update --clean .` which\n" " To undo an uncommitted merge, use :hg:`update --clean .` which\n"
" will check out a clean copy of the original merge parent, losing\n" " will check out a clean copy of the original merge parent, losing\n"

i18n/ja.po

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
" このオプションによる指定は、\n" " このオプションによる指定は、\n"
" HGMERGE 環境変数や設定ファイルによる指定を上書きします。\n" " HGMERGE 環境変数や設定ファイルによる指定を上書きします。\n"
" 指定の詳細に関しては、 :hg:`help merge-tools` を参照してください。" " 指定の詳細に関しては、 :hg:`help merge-tools` を参照してください。"
msgid "" msgid ""
" If no revision is specified, the working directory's parent is a\n" " If no revision is specified, the working directory's parent is a\n"
" head revision, and the current branch contains exactly one other\n" " head revision, and the current branch contains exactly one other\n"
" head, the other head is merged with by default. Otherwise, an\n" " head, the other head is merged with by default. Otherwise, an\n"
" explicit revision with which to merge with must be provided." " explicit revision with which to merge must be provided."
msgstr "" msgstr ""
" マージ対象リビジョンの指定が無く、 作業領域の親リビジョンがヘッドで、\n" " マージ対象リビジョンの指定が無く、 作業領域の親リビジョンがヘッドで、\n"
" 且つ現行ブランチがもう1つだけヘッドを持つ場合、 そのヘッドがマージ\n" " 且つ現行ブランチがもう1つだけヘッドを持つ場合、 そのヘッドがマージ\n"
" 対象となります。 それ以外の場合は、 明示的なリビジョン指定が必要です。" " 対象となります。 それ以外の場合は、 明示的なリビジョン指定が必要です。"
msgid " See :hg:`help resolve` for information on handling file conflicts." msgid " See :hg:`help resolve` for information on handling file conflicts."
msgstr " 衝突の扱いに関する詳細は :hg:`help resolve` を参照してください。" msgstr " 衝突の扱いに関する詳細は :hg:`help resolve` を参照してください。"

i18n/pt_BR.po

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
" mesclagem usado para mesclagens de arquivo. Esta opção sobrepõe\n" " mesclagem usado para mesclagens de arquivo. Esta opção sobrepõe\n"
" a variável de ambiente HGMERGE e os valores especificados nos\n" " a variável de ambiente HGMERGE e os valores especificados nos\n"
" arquivos de configuração. Veja :hg:`help merge-tools` para opções." " arquivos de configuração. Veja :hg:`help merge-tools` para opções."
msgid "" msgid ""
" If no revision is specified, the working directory's parent is a\n" " If no revision is specified, the working directory's parent is a\n"
" head revision, and the current branch contains exactly one other\n" " head revision, and the current branch contains exactly one other\n"
" head, the other head is merged with by default. Otherwise, an\n" " head, the other head is merged with by default. Otherwise, an\n"
" explicit revision with which to merge with must be provided." " explicit revision with which to merge must be provided."
msgstr "" msgstr ""
" Se a revisão não for especificada, o pai do diretório de trabalho\n" " Se a revisão não for especificada, o pai do diretório de trabalho\n"
" for uma revisão cabeça, e o ramo atual contiver exatamente uma\n" " for uma revisão cabeça, e o ramo atual contiver exatamente uma\n"
" outra cabeça, a outra cabeça será usada para a mesclagem. Caso\n" " outra cabeça, a outra cabeça será usada para a mesclagem. Caso\n"
" contrário, uma revisão com a qual mesclar deve ser fornecida\n" " contrário, uma revisão com a qual mesclar deve ser fornecida\n"
" explicitamente." " explicitamente."
msgid " See :hg:`help resolve` for information on handling file conflicts." msgid " See :hg:`help resolve` for information on handling file conflicts."

i18n/ro.po

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
" pentru fuziune folosit la fuziunile de fișiere. Acesta\n" " pentru fuziune folosit la fuziunile de fișiere. Acesta\n"
" prevalează asupra variabilei de mediu HGMERGE și a fișierelor\n" " prevalează asupra variabilei de mediu HGMERGE și a fișierelor\n"
" dvs. de configurare. Pentru opțiuni vezi :hg:`help merge-tools`." " dvs. de configurare. Pentru opțiuni vezi :hg:`help merge-tools`."
msgid "" msgid ""
" If no revision is specified, the working directory's parent is a\n" " If no revision is specified, the working directory's parent is a\n"
" head revision, and the current branch contains exactly one other\n" " head revision, and the current branch contains exactly one other\n"
" head, the other head is merged with by default. Otherwise, an\n" " head, the other head is merged with by default. Otherwise, an\n"
" explicit revision with which to merge with must be provided." " explicit revision with which to merge must be provided."
msgstr "" msgstr ""
" Dacă nu se specifică niciun părinte, părintele directorului de\n" " Dacă nu se specifică niciun părinte, părintele directorului de\n"
" lucru este o revizie capăt, iar ramura curentă conține exact\n" " lucru este o revizie capăt, iar ramura curentă conține exact\n"
" un singur alt capăt, atunci implicit fuziunea are loc cu celălalt\n" " un singur alt capăt, atunci implicit fuziunea are loc cu celălalt\n"
" capăt. Altfel, o revizie explicită cu care să aibă loc fuziunea\n" " capăt. Altfel, o revizie explicită cu care să aibă loc fuziunea\n"
" trebuie specificată." " trebuie specificată."
msgid " :hg:`resolve` must be used to resolve unresolved files." msgid " :hg:`resolve` must be used to resolve unresolved files."

i18n/ru.po

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
" С помощью ``--tool`` можно задать инструмент для слияния файлов.\n" " С помощью ``--tool`` можно задать инструмент для слияния файлов.\n"
" Она заменяет переменную окружения HGMERGE и настройки конфига.\n" " Она заменяет переменную окружения HGMERGE и настройки конфига.\n"
" Подробнее см. :hg:`help merge-tools`." " Подробнее см. :hg:`help merge-tools`."
msgid "" msgid ""
" If no revision is specified, the working directory's parent is a\n" " If no revision is specified, the working directory's parent is a\n"
" head revision, and the current branch contains exactly one other\n" " head revision, and the current branch contains exactly one other\n"
" head, the other head is merged with by default. Otherwise, an\n" " head, the other head is merged with by default. Otherwise, an\n"
" explicit revision with which to merge with must be provided." " explicit revision with which to merge must be provided."
msgstr "" msgstr ""
" Если ревизия не указана, родитель рабочего каталога является\n" " Если ревизия не указана, родитель рабочего каталога является\n"
" головной ревизией и текущая ветка имеет ровно одну другую голову,\n" " головной ревизией и текущая ветка имеет ровно одну другую голову,\n"
" производится слияние с этой головой по умолчанию. В противном\n" " производится слияние с этой головой по умолчанию. В противном\n"
" случае, требуется явно указать ревизию для слияния." " случае, требуется явно указать ревизию для слияния."
msgid " :hg:`resolve` must be used to resolve unresolved files." msgid " :hg:`resolve` must be used to resolve unresolved files."
msgstr "" msgstr ""

i18n/sv.po

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
" använda för filsammanfogningar. Det har högre prioritet än\n" " använda för filsammanfogningar. Det har högre prioritet än\n"
" miljövariabeln HGMERGE och dina konfigurationsfiler. Se\n" " miljövariabeln HGMERGE och dina konfigurationsfiler. Se\n"
" :hg:`help merge-tools` för flaggor." " :hg:`help merge-tools` för flaggor."
msgid "" msgid ""
" If no revision is specified, the working directory's parent is a\n" " If no revision is specified, the working directory's parent is a\n"
" head revision, and the current branch contains exactly one other\n" " head revision, and the current branch contains exactly one other\n"
" head, the other head is merged with by default. Otherwise, an\n" " head, the other head is merged with by default. Otherwise, an\n"
" explicit revision with which to merge with must be provided." " explicit revision with which to merge must be provided."
msgstr "" msgstr ""
" Om ingen revision anges, arbetskatalogens förälder är en huvudrevision,\n" " Om ingen revision anges, arbetskatalogens förälder är en huvudrevision,\n"
" och den nuvarande grenen innehåller exakt ett annat huvud, sammanfogas\n" " och den nuvarande grenen innehåller exakt ett annat huvud, sammanfogas\n"
" det andra huvudet som standard. Om inte, måste en explicit revision\n" " det andra huvudet som standard. Om inte, måste en explicit revision\n"
" anges." " anges."
msgid " :hg:`resolve` must be used to resolve unresolved files." msgid " :hg:`resolve` must be used to resolve unresolved files."
msgstr " :hg:`resolve` måste användas för att lösa olästa filer." msgstr " :hg:`resolve` måste användas för att lösa olästa filer."

i18n/zh_CN.po

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
" 中，合并后的内容是新的顶点。否则，必须明确的指定要合并的版本。\n" " 中，合并后的内容是新的顶点。否则，必须明确的指定要合并的版本。\n"
" " " "
#, fuzzy #, fuzzy
msgid "" msgid ""
" If no revision is specified, the working directory's parent is a\n" " If no revision is specified, the working directory's parent is a\n"
" head revision, and the current branch contains exactly one other\n" " head revision, and the current branch contains exactly one other\n"
" head, the other head is merged with by default. Otherwise, an\n" " head, the other head is merged with by default. Otherwise, an\n"
" explicit revision with which to merge with must be provided.\n" " explicit revision with which to merge must be provided.\n"
" " " "
msgstr "" msgstr ""
"将工作目录与其它版本合并\n" "将工作目录与其它版本合并\n"
"\n" "\n"
" 将当前工作目录中的内容与指定版本合并。对任一父亲而言改变的文件都会对\n" " 将当前工作目录中的内容与指定版本合并。对任一父亲而言改变的文件都会对\n"
" 下次提交标记为已修改，在提交之前不允许再执行更新。\n" " 下次提交标记为已修改，在提交之前不允许再执行更新。\n"
"\n" "\n"
" 如果没有指定版本，那么工作目录的父亲是一个合并顶点，另一个在当前分支\n" " 如果没有指定版本，那么工作目录的父亲是一个合并顶点，另一个在当前分支\n"

i18n/zh_TW.po

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
" merges. It overrides the HGMERGE environment variable and your\n" " merges. It overrides the HGMERGE environment variable and your\n"
" configuration files." " configuration files."
msgstr "" msgstr ""
msgid "" msgid ""
" If no revision is specified, the working directory's parent is a\n" " If no revision is specified, the working directory's parent is a\n"
" head revision, and the current branch contains exactly one other\n" " head revision, and the current branch contains exactly one other\n"
" head, the other head is merged with by default. Otherwise, an\n" " head, the other head is merged with by default. Otherwise, an\n"
" explicit revision with which to merge with must be provided." " explicit revision with which to merge must be provided."
msgstr "" msgstr ""
msgid " :hg:`resolve` must be used to resolve unresolved files." msgid " :hg:`resolve` must be used to resolve unresolved files."
msgstr " hg `resolve` 必須使用在解決未解決的檔案." msgstr " hg `resolve` 必須使用在解決未解決的檔案."
msgid "" msgid ""
" To undo an uncommitted merge, use :hg:`update --clean .` which\n" " To undo an uncommitted merge, use :hg:`update --clean .` which\n"
" will check out a clean copy of the original merge parent, losing\n" " will check out a clean copy of the original merge parent, losing\n"

mercurial/commands.py

``--tool`` can be used to specify the merge tool used for file ``--tool`` can be used to specify the merge tool used for file
merges. It overrides the HGMERGE environment variable and your merges. It overrides the HGMERGE environment variable and your
configuration files. See :hg:`help merge-tools` for options. configuration files. See :hg:`help merge-tools` for options.
If no revision is specified, the working directory's parent is a If no revision is specified, the working directory's parent is a
head revision, and the current branch contains exactly one other head revision, and the current branch contains exactly one other
head, the other head is merged with by default. Otherwise, an head, the other head is merged with by default. Otherwise, an
explicit revision with which to merge with must be provided. explicit revision with which to merge must be provided.
See :hg:`help resolve` for information on handling file conflicts. See :hg:`help resolve` for information on handling file conflicts.
To undo an uncommitted merge, use :hg:`merge --abort` which To undo an uncommitted merge, use :hg:`merge --abort` which
will check out a clean copy of the original merge parent, losing will check out a clean copy of the original merge parent, losing
all changes. all changes.
Returns 0 on success, 1 if there are unresolved files. Returns 0 on success, 1 if there are unresolved files.