view relnotes/5.2 @ 45275:8e8d513941b4

merge: introduce 'commitinfo' in mergeresult

commitinfo will be used to pass information which is required on commit phase
from the merge phase.

One common example is, merge chooses filenode from second parent and we need to
tell commit to choose that. Right now this one and related cases are not very
neatly implement and there is no clear line on how to pass on such information.
Upcoming patches will try to work on in this area and make things easier.

Differential Revision: https://phab.mercurial-scm.org/D8742

== 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 ==