--- a/CHANGELOG Mon Nov 04 00:18:55 2019 +0530
+++ b/CHANGELOG Sat Feb 01 12:50:10 2020 +0100
@@ -14,21 +14,27 @@
* evolve: add content divergence checking to the standard pre-rewrite check,
* evolve: improve the message associated with content divergence.
-9.2.2 - in progress
+9.2.2 -- 2020-01-31
-------------------
- * pick: don't create any successors when there were no changes (issue6093),
+ * amend: cleany abort when both `--patch` and `--extract` are passed
+ * compatibility for changes in upcoming Mercurial 5.3
+ * debian: allow to build with python 3
+ * documentation: update text and add missing figures
+ * evolve: also merge the date field when solving content-divergence
+ * evolve: fix content-divergence resolution when p1 is null (issue6201)
+ * evolve: make sure divergence resolution doesn't undo changes (issue6203)
+ * evolve: preserve date when resolving content-divergence (issue6202)
+ * evolve: use more often seen metavariables in command synopsis strings
* metaedit: don't change commit date by default (issue5994),
- * rewind: preserve date
+ * pick: don't create any successors when there were no changes (issue6093),
+ * py3: fix documentation generation
* py3: fix setup.py --version
- * py3: fix documentation generation
* py3: fix some exception formatting
- * debian: allow to build with python 3
+ * rewind: preserve date
* topic: add more options to command synopsis string
- * evolve: use more often seen metavariables in command synopsis strings
- * documentation: update text and add missing figures
- * amend: cleany abort when both `--patch` and `--extract` are passed
- * evolve: also merge the date field when solving content-divergence
+ * topic: fix a bug in logic of choosing destination for hg update
+ * topic: fix a bug in logic to choose destination when no active topic
9.2.1 -- 2019-10-05
-------------------