view relnotes/5.2 @ 46563:c19c662097e1

copies: detect case when a merge decision overwrite previous data

We now detect and record when a merge case required special logic (eg: thing
that append during the merge, ambiguity leading to picking p1 data, etc) and we
explicitly mark the result as superseding the previous data.

This fixes the family of test we previously added.

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

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