--- a/README Fri May 06 00:03:28 2016 +0200
+++ b/README Fri May 06 00:08:31 2016 +0200
@@ -16,20 +16,20 @@
You can enable it by adding the line below to the ``extensions``
section of your hgrc::
- evolve = PATH/TO/mutable-history/hgext/evolve.py
+ evolve = PATH/TO/evolve-main/hgext/evolve.py
We recommend reading the documentation first. An online version is
available here:
- http://evolution.experimentalworks.net/doc/
+ https://www.mercurial-scm.org/doc/evolution/
Or see the ``doc/`` directory for a local copy.
Contribute
==========
-Bugs are to be reported on the mercurial's bug tracker: http://bz.mercurial-scm.com/
-Use the the "evolution" component.
+Bugs are to be reported on the mercurial's bug tracker (component: evolution):
+https://bz.mercurial-scm.org/buglist.cgi?component=evolution&query_format=advanced&resolution=---
Please use the patchbomb extension to send email to mercurial devel. Please
make sure to use the evolve-ext flag when doing so. You can use a command like
@@ -56,19 +56,33 @@
Changelog
=========
-5.3.0 --
+5.4.0 --
+
+- Some collaboration with the topic experimental extensions,
+ - hg evolve --all with consider all troubles in your current topic,
+ - preserve 'topic' during evolve,
+ - 'next' and 'prev' restrict themself to the current topic by default,
+- remove the dangerous 'kill' alias for 'prune' (because 'hg kill -1' without
+the leading 'hg' will give you an hardtime)
+- during 'hg evolve' skip unsupported merge instead of aborting
+- various documentation fix and update
+- hg summary now suggest 'hg evolve --continue when appropriate`
+- compatibility with Mercurial 3.8 'hgext' namespace package.
+- small improvement to the `hg split` instruction
+- add a 'metaedit' command to rewrite changeset meta data.
+
+5.3.0 -- 2016-02-11
- split: add a new command to split changesets,
- tests: drop our copy of 'run-tests.py' use core one instead,
- bookmark: do all bookmark movement within a transaction.
- evolve: compatibility with Mercurial 3.7
-- evolve: support merge with a single obsolete parent.
+- evolve: support merge with a single obsolete parent (hg-3.7+ only)
- evolve: prevent added file to be marked as unknown if evolve fails (issue4966)
- evolve: stop relying on graftstate file for save evolve state
(for `hg evolve --continue`)
-
-5.2.2 --
-
+- evolve: fix divergence resolution when it result in an empty commit
+ (issue4950) (hg-3.5+ only)
- no longer lock the repository for `hg parents` (issue4895)
- updated help for the `evolve` command
@@ -95,7 +109,7 @@
in now in `--all --any`.
- evolve: add a 'experimental.evolutioncommands' for fine grained commands
enabling
-- next/prev: requires `--merge` to move with uncommited changes
+- next/prev: requires `--merge` to move with uncommitted changes
- next: significantly reword error messages
- next: add a --evolve flag to evolve aspiring children when on a head