Mercurial > hg
view relnotes/5.3 @ 48716:f1eb77dceb36
narrow: allow merging non-conflicting change outside of the narrow spec
We use the mergestate to carry information about these merge action and
reprocess them at commit time to apply the necessary update.
The dirstate itself is never affected and remains "pure", with content only in
the narrow-spec. This file involved in such merge are therefor not listed in `hg
status`.
The current testing is based on a modification of the previous testing, that
refused to do such merges. As a result it is a bit simple and more extensive
code and testing testing will have to be introduced later. I am planning to do
this extra testing, soon.
In addition, this only works for flat manifest. Support for tree manifest will
need more work. I am not currently planning to do this work.
Differential Revision: https://phab.mercurial-scm.org/D12119
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Thu, 03 Feb 2022 18:14:11 +0100 |
parents | 1f8f215219ff |
children |
line wrap: on
line source
== New Features == * Windows will process hgrc files in %PROGRAMDATA%\Mercurial\hgrc.d. == New Experimental Features == == Bug Fixes == * The `indent()` template function was documented to not indent empty lines, but it still indented the first line even if it was empty. It no longer does that. == Backwards Compatibility Changes == == Internal API Changes == * Matcher instances no longer have a `explicitdir` property. Consider rewriting your code to use `repo.wvfs.isdir()` and/or `ctx.hasdir()` instead. Also, the `traversedir` property is now also called when only `explicitdir` used to be called. That may mean that you can simply remove the use of `explicitdir` if you were already using `traversedir`. * The `revlog.nodemap` object have been merged into the `revlog.index` object. * `n in revlog.nodemap` becomes `revlog.index.has_node(n)`, * `revlog.nodemap[n]` becomes `revlog.index.rev(n)`, * `revlog.nodemap.get(n)` becomes `revlog.index.get_rev(n)`. * `copies.duplicatecopies()` was renamed to `copies.graftcopies()`. Its arguments changed from revision numbers to context objects. It also lost its `repo` and `skip` arguments (they should no longer be needed).