##// END OF EJS Templates
bookmarks: use correct store for "ambiguity check"...
bookmarks: use correct store for "ambiguity check" I still don't quite know what the check does, but I clearly got it wrong in 526750cdd02d (bookmarks: keep bookmarks in .hg/store if new config set, 2019-05-15). Just compare with the strings we use in @repofilecache and @storecache. These bugs were then copied to the stable branch in c2b83c957621 (localrepo: grab mixedrepostorecache class from 526750cdd02d, 2019-05-20) and 2338bdea4474 (bookmark: also make bookmark cache depends of the changelog, 2019-05-20). As a result, test-wireproto-exchangev2.t is flaky on both branches. This patch fixes that. Differential Revision: https://phab.mercurial-scm.org/D6469

File last commit:

r39304:0dfcc348 default
r42613:d532292e stable
Show More
merge-tools.txt
109 lines | 4.4 KiB | text/plain | TextLexer
Erik Zielke
help: help topic for merge tools...
r12771 To merge files Mercurial uses merge tools.
A merge tool combines two different versions of a file into a merged
file. Merge tools are given the two files and the greatest common
ancestor of the two file versions, so they can determine the changes
made on both branches.
Mads Kiilerich
help: improve merge-tools topic, describe --tool and clarify details...
r12809 Merge tools are used both for :hg:`resolve`, :hg:`merge`, :hg:`update`,
:hg:`backout` and in several extensions.
Erik Zielke
help: help topic for merge tools...
r12771
Martin Geisler
merge-tools: fixed typos...
r12804 Usually, the merge tool tries to automatically reconcile the files by
Mads Kiilerich
help: improve merge-tools topic, describe --tool and clarify details...
r12809 combining all non-overlapping changes that occurred separately in
the two different evolutions of the same initial base file. Furthermore, some
Erik Zielke
help: help topic for merge tools...
r12771 interactive merge programs make it easier to manually resolve
conflicting merges, either in a graphical way, or by inserting some
conflict markers. Mercurial does not include any interactive merge
Mads Kiilerich
help: improve merge-tools topic, describe --tool and clarify details...
r12809 programs but relies on external tools for that.
Available merge tools
FUJIWARA Katsunori
doc: unify section level between help topics...
r17267 =====================
Mads Kiilerich
help: improve merge-tools topic, describe --tool and clarify details...
r12809
Patrick Mezard
merge-tools.txt: fix typos, simplify, renumber from 1.
r12824 External merge tools and their properties are configured in the
merge-tools configuration section - see hgrc(5) - but they can often just
Mads Kiilerich
help: improve merge-tools topic, describe --tool and clarify details...
r12809 be named by their executable.
A merge tool is generally usable if its executable can be found on the
Patrick Mezard
merge-tools.txt: fix typos, simplify, renumber from 1.
r12824 system and if it can handle the merge. The executable is found if it
is an absolute or relative executable path or the name of an
application in the executable search path. The tool is assumed to be
able to handle the merge if it can handle symlinks if the file is a
symlink, if it can handle binary files if the file is binary, and if a
GUI is available if the tool requires a GUI.
Erik Zielke
help: help topic for merge tools...
r12771
Wagner Bruna
help: fix typo in merge-tools topic
r12858 There are some internal merge tools which can be used. The internal
Erik Zielke
help: help topic for merge tools...
r12771 merge tools are:
FUJIWARA Katsunori
filemerge: create detail of internal merge tools from documentation string...
r16126 .. internaltoolsmarker
Erik Zielke
help: help topic for merge tools...
r12771
FUJIWARA Katsunori
filemerge: show actual capabilities of internal merge tools...
r39162 Internal tools are always available and do not require a GUI but will
by default not handle symlinks or binary files. See next section for
detail about "actual capabilities" described above.
Mads Kiilerich
help: improve merge-tools topic, describe --tool and clarify details...
r12809
Choosing a merge tool
FUJIWARA Katsunori
doc: unify section level between help topics...
r17267 =====================
Erik Zielke
help: help topic for merge tools...
r12771
Patrick Mezard
merge-tools.txt: fix typos, simplify, renumber from 1.
r12824 Mercurial uses these rules when deciding which merge tool to use:
Mads Kiilerich
help: improve merge-tools topic, describe --tool and clarify details...
r12809
Patrick Mezard
merge-tools.txt: fix typos, simplify, renumber from 1.
r12824 1. If a tool has been specified with the --tool option to merge or resolve, it
Mads Kiilerich
help: improve merge-tools topic, describe --tool and clarify details...
r12809 is used. If it is the name of a tool in the merge-tools configuration, its
configuration is used. Otherwise the specified tool must be executable by
the shell.
Erik Zielke
help: help topic for merge tools...
r12771
Patrick Mezard
merge-tools.txt: fix typos, simplify, renumber from 1.
r12824 2. If the ``HGMERGE`` environment variable is present, its value is used and
Mads Kiilerich
help: improve merge-tools topic, describe --tool and clarify details...
r12809 must be executable by the shell.
Patrick Mezard
merge-tools.txt: fix typos, simplify, renumber from 1.
r12824 3. If the filename of the file to be merged matches any of the patterns in the
Mads Kiilerich
help: improve merge-tools topic, describe --tool and clarify details...
r12809 merge-patterns configuration section, the first usable merge tool
FUJIWARA Katsunori
help: describe more detail about capabilities while deciding merge tool...
r39157 corresponding to a matching pattern is used.
Erik Zielke
help: help topic for merge tools...
r12771
Patrick Mezard
merge-tools.txt: fix typos, simplify, renumber from 1.
r12824 4. If ui.merge is set it will be considered next. If the value is not the name
Mads Kiilerich
help: improve merge-tools topic, describe --tool and clarify details...
r12809 of a configured tool, the specified value is used and must be executable by
the shell. Otherwise the named tool is used if it is usable.
Erik Zielke
help: help topic for merge tools...
r12771
Patrick Mezard
merge-tools.txt: fix typos, simplify, renumber from 1.
r12824 5. If any usable merge tools are present in the merge-tools configuration
section, the one with the highest priority is used.
Erik Zielke
help: help topic for merge tools...
r12771
Patrick Mezard
merge-tools.txt: 6 comes after 5
r12826 6. If a program named ``hgmerge`` can be found on the system, it is used - but
Mads Kiilerich
help: improve merge-tools topic, describe --tool and clarify details...
r12809 it will by default not be used for symlinks and binary files.
Erik Zielke
help: help topic for merge tools...
r12771
Patrick Mezard
merge-tools.txt: fix typos, simplify, renumber from 1.
r12824 7. If the file to be merged is not binary and is not a symlink, then
Mads Kiilerich
filemerge: switch the default name for internal tools from internal:x to :x
r22707 internal ``:merge`` is used.
Erik Zielke
help: help topic for merge tools...
r12771
FUJIWARA Katsunori
help: describe about choice of :prompt as a fallback merge tool explicitly...
r32179 8. Otherwise, ``:prompt`` is used.
Erik Zielke
help: help topic for merge tools...
r12771
FUJIWARA Katsunori
help: revise explanation about capability check while selecting merge tool...
r39304 For historical reason, Mercurial treats merge tools as below while
examining rules above.
FUJIWARA Katsunori
help: describe more detail about capabilities while deciding merge tool...
r39157
==== =============== ====== =======
step specified via binary symlink
==== =============== ====== =======
FUJIWARA Katsunori
help: revise explanation about capability check while selecting merge tool...
r39304 1. --tool o/o o/o
2. HGMERGE o/o o/o
3. merge-patterns o/o(*) x/?(*)
4. ui.merge x/?(*) x/?(*)
FUJIWARA Katsunori
help: describe more detail about capabilities while deciding merge tool...
r39157 ==== =============== ====== =======
FUJIWARA Katsunori
help: revise explanation about capability check while selecting merge tool...
r39304 Each capability column indicates Mercurial behavior for
internal/external merge tools at examining each rule.
- "o": "assume that a tool has capability"
- "x": "assume that a tool does not have capability"
- "?": "check actual capability of a tool"
FUJIWARA Katsunori
filemerge: add config knob to check capabilities of internal merge tools...
r39161 If ``merge.strict-capability-check`` configuration is true, Mercurial
FUJIWARA Katsunori
help: revise explanation about capability check while selecting merge tool...
r39304 checks capabilities of merge tools strictly in (*) cases above (= each
capability column becomes "?/?"). It is false by default for backward
compatibility.
FUJIWARA Katsunori
filemerge: add config knob to check capabilities of internal merge tools...
r39161
Erik Zielke
help: help topic for merge tools...
r12771 .. note::
Simon Heimberg
help: remove last occurrences of ".. note::" without two newlines...
r20532
Erik Zielke
help: help topic for merge tools...
r12771 After selecting a merge program, Mercurial will by default attempt
Mads Kiilerich
help: improve merge-tools topic, describe --tool and clarify details...
r12809 to merge the files using a simple merge algorithm first. Only if it doesn't
Matt Harbison
help: minor copy editing for grammar
r34950 succeed because of conflicting changes will Mercurial actually execute the
Mads Kiilerich
help: improve merge-tools topic, describe --tool and clarify details...
r12809 merge program. Whether to use the simple merge algorithm first can be
controlled by the premerge setting of the merge tool. Premerge is enabled by
default unless the file is binary or a symlink.
Erik Zielke
help: help topic for merge tools...
r12771
Mads Kiilerich
help: improve merge-tools topic, describe --tool and clarify details...
r12809 See the merge-tools and ui sections of hgrc(5) for details on the
Erik Zielke
help: help topic for merge tools...
r12771 configuration of merge tools.