Mercurial > hg
view relnotes/5.2 @ 44857:e607099d8b93
context: implement mergestate() method
This will let us have the mergestate storage be controlled by the context. In
particular, for working contexts we should use the existing mergestate, but
for overlay contexts it's inappropriate to drop files in .hg/merge.
Differential Revision: https://phab.mercurial-scm.org/D8551
author | Augie Fackler <augie@google.com> |
---|---|
date | Mon, 18 May 2020 16:00:26 -0400 |
parents | a825ba8eb0a1 |
children |
line wrap: on
line source
== 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 ==