Commit 3f67440f authored by Anton Shestakov's avatar Anton Shestakov
Browse files

changelog: update for evolve 10.1.0

--HG--
branch : stable
parent fe31179e1941
Changelog
=========
10.1.0 - in progress
10.1.0 -- 2020-10-31
--------------------
* compatibility with Mercurial 5.6
* numerous minor changes to packaging, Makefile, README moved to README.rst
* metaedit: update bookmark location when applicable
* evolve: various improvements to content-divergence resolution
* evolve: fix various issues with --continue when solving content-divergence
* rewind: add a --dry-run flag
* rewind: properly record rewind of splits as folds
* evolve: specify the source of config override for `server.bundle1=no`
* evolve: avoid leaving mergestate after instability resolution
* evolve: while resolving conflicts, the evolved node will no longer be a
dirstate parent (won't show up in `hg parents` and not as `@` in `hg log -G`,
but it will show up as `%` with hg >= 5.4)
* metaedit: update bookmark location when applicable
* rewind: add a --dry-run flag
* rewind: properly record rewind of splits as folds
topic (0.20.0)
* stack: support foo#stack relation revset (hg-5.4+ only)
* merge: add a experimental.topic.linear-merge option to allow oedipus merges
in some cases
10.0.3 - in progress
--------------------
* evolve: specific the source of config override for `server.bundle1=no`
* evolve: avoid leaving mergestate after instability resolution
* metaedit: update bookmark location when applicable
10.0.2 -- 2020-09-08
--------------------
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment