Mercurial > hg
view mercurial/help/bundlespec.txt @ 32255:7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
Internal merge tool :dump implies premerge. Therefore, files aren't
dumped, if premerge runs successfully.
This undocumented behavior might confuse users, if they want to always
dump files. But just making :dump omit premerge might cause backward
compatibility issue for existing automation.
This patch adds new internal merge tool :forcedump, which works as
same as :dump, but omits premerge always.
Internal tools annotated with "nomerge" should merge "change and
delete" correctly, but _forcedump() can't. Therefore, it is annotated
with "mergeonly" to always omit premerge, even though it doesn't merge
files actually.
This patch also adds explanation about premerge to :dump, to clarify
how :dump actually works.
BTW, this patch specifies internal tools with "internal:" prefix in
newly added test scenario in test-merge-tools.t, even though this
prefix is already deprecated. This is only for similarity to other
tests in test-merge-tools.t.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Sat, 13 May 2017 03:31:42 +0900 |
parents | de86a6872d06 |
children | 01280ec5f840 |
line wrap: on
line source
Mercurial supports generating standalone "bundle" files that hold repository data. These "bundles" are typically saved locally and used later or exchanged between different repositories, possibly on different machines. Example commands using bundles are :hg:`bundle` and :hg:`unbundle`. Generation of bundle files is controlled by a "bundle specification" ("bundlespec") string. This string tells the bundle generation process how to create the bundle. A "bundlespec" string is composed of the following elements: type A string denoting the bundle format to use. compression Denotes the compression engine to use compressing the raw bundle data. parameters Arbitrary key-value parameters to further control bundle generation. A "bundlespec" string has the following formats: <type> The literal bundle format string is used. <compression>-<type> The compression engine and format are delimited by a hyphen (``-``). Optional parameters follow the ``<type>``. Parameters are URI escaped ``key=value`` pairs. Each pair is delimited by a semicolon (``;``). The first parameter begins after a ``;`` immediately following the ``<type>`` value. Available Types =============== The following bundle <type> strings are available: v1 Produces a legacy "changegroup" version 1 bundle. This format is compatible with nearly all Mercurial clients because it is the oldest. However, it has some limitations, which is why it is no longer the default for new repositories. ``v1`` bundles can be used with modern repositories using the "generaldelta" storage format. However, it may take longer to produce the bundle and the resulting bundle may be significantly larger than a ``v2`` bundle. ``v1`` bundles can only use the ``gzip``, ``bzip2``, and ``none`` compression formats. v2 Produces a version 2 bundle. Version 2 bundles are an extensible format that can store additional repository data (such as bookmarks and phases information) and they can store data more efficiently, resulting in smaller bundles. Version 2 bundles can also use modern compression engines, such as ``zstd``, making them faster to compress and often smaller. Available Compression Engines ============================= The following bundle <compression> engines can be used: .. bundlecompressionmarker Examples ======== ``v2`` Produce a ``v2`` bundle using default options, including compression. ``none-v1`` Produce a ``v2`` bundle with no compression. ``zstd-v2`` Produce a ``v2`` bundle with zstandard compression using default settings. ``zstd-v1`` This errors because ``zstd`` is not supported for ``v1`` types.