hg import [ПАРАМЕТР]... ПАТЧ...

псевдонимы: patch

импортировать упорядоченный набор патчей

Импортирует список патчей и фиксирует их по отдельности (если не задан параметр --no-commit)

To read a patch from standard input (stdin), use "-" as the patch name. If a URL is specified, the patch will be downloaded from there.

Import first applies changes to the working directory (unless --bypass is specified), import will abort if there are outstanding changes.

Use --bypass to apply and commit patches directly to the repository, without affecting the working directory. Without --exact, patches will be applied on top of the working directory parent revision.

You can import a patch straight from a mail message. Even patches as attachments work (to use the body part, it must have type text/plain or text/x-patch). From and Subject headers of email message are used as default committer and commit message. All text/plain body parts before first diff are added to the commit message.

Если импортируемый патч был сгенерирован с помощью 'hg export', пользователь и описание из патча используются вместо заголовков и тела электронного письма. С помощью параметров -m/--message и -u/--user можно задать эти значения явно.

If --exact is specified, import will set the working directory to the parent of each patch before applying it, and will abort if the resulting changeset has a different ID than the one recorded in the patch. This will guard against various ways that portable patch formats and mail systems might fail to transfer Mercurial data or metadata. See 'hg bundle' for lossless transmission.

Use --partial to ensure a changeset will be created from the patch even if some hunks fail to apply. Hunks that fail to apply will be written to a <target-file>.rej file. Conflicts can then be resolved by hand before 'hg commit --amend' is run to update the created changeset. This flag exists to let people import patches that partially apply without losing the associated metadata (author, date, description, ...).

Примечание:

When no hunks apply cleanly, 'hg import --partial' will create an empty changeset, importing only the patch metadata.

Если указан -s/--similatity, Mercurial попытается обнаружить копирования и переименования в патче так же, как в 'hg addremove'.

It is possible to use external patch programs to perform the patch by setting the "ui.patch" configuration option. For the default internal tool, the fuzz can also be configured via "patch.fuzz". See 'hg help config' for more information about configuration files and how to use these options.

Список возможных форматов для --d/--dates см. 'hg help dates'

Примеры:

• импортировать традиционный патч и веб-сайта и найти переименования:

  hg import -s 80 http://example.com/bugfix.patch
  

• импортировать набор изменений с сервера hgweb:

  hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
  

• импортировать все патчи из файла почтового ящика Unix mbox:

  hg import incoming-patches.mbox
  

• import patches from stdin:

  hg import -
  

• попытаться строго восстановить экспортированный набор изменений (не всегда возможно):

  hg import --exact proposed-fix.patch
  

• use an external tool to apply a patch which is too fuzzy for the default internal tool.

  hg import --config ui.patch="patch --merge" fuzzy.patch

• change the default fuzzing from 2 to a less strict 7

  hg import --config ui.fuzz=7 fuzz.patch

При успехе возвращает 0, 1 при частичном успехе (см. --partial)

options:

global options ([+] can be repeated):