view relnotes/5.2 @ 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

== New Features ==

 * The amend extension supports the `--currentuser` argument.

 * The amend extension supports the `--close-branch` argument.

 * The amend extension supports the `--secret` argument.

 * The uncommit extension supports the `rewrite.update-timestamp` config option.

== New Experimental Features ==


== Bug Fixes  ==


== Backwards Compatibility Changes ==

 * A shell that supports `$(command)`` syntax for command substitution is now
   required for running the test suite. The test runner normally uses
   `sh`, so if that is a shell that doesn't support `$(command)` syntax,
   you can override it by setting `$HGTEST_SHELL` or by passing it to
   `run-tests.py --shell <shell>`.

 * The (experimental) narrow extension's wire protocol changed. If
   you're using it, you'll need to make sure to upgrade server and
   client at the same time.

== Internal API Changes ==