Mercurial > hg

comparison relnotes/next @ 46451:38d76908c011 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
relnotes: elaborate on the side effects of hooks having HGPLAIN=1 Differential Revision: https://phab.mercurial-scm.org/D9943
author Matt Harbison <matt_harbison@yahoo.com>
date Mon, 01 Feb 2021 15:37:03 -0500
parents c4b792fa109e
children 0e2e7300f430
comparison
equal deleted inserted replaced
46450:e933e66153f3 46451:38d76908c011
35 shows one snapshot and a diff. This may be useful when at least one 35 shows one snapshot and a diff. This may be useful when at least one
36 side of the conflict is similar to the base. The new marker style 36 side of the conflict is similar to the base. The new marker style
37 is also supported by "premerge" as 37 is also supported by "premerge" as
38 `merge-tools.<tool>.premerge=keep-mergediff`. 38 `merge-tools.<tool>.premerge=keep-mergediff`.
39 39
40 * External hooks are now called with `HGPLAIN=1` preset. 40 * External hooks are now called with `HGPLAIN=1` preset. This has the side
41 effect of ignoring aliases, templates, revsetaliases, and a few other config
42 options in any `hg` command spawned by the hook. The previous behavior
43 can be restored by setting HGPLAINEXCEPT appropriately in the parent process.
44 See `hg help environment` for the list of items, and how to set it.
41 45
42 * The `branchmap` cache is updated more intelligently and can be 46 * The `branchmap` cache is updated more intelligently and can be
43 significantly faster for repositories with many branches and changesets. 47 significantly faster for repositories with many branches and changesets.
44 48
45 49