diff -r f0c18ad24273 -r 25fc1a2c3dc6 CHANGELOG --- a/CHANGELOG Mon Jan 27 14:55:35 2020 +0700 +++ b/CHANGELOG Fri Jan 31 14:44:39 2020 +0100 @@ -1,25 +1,25 @@ Changelog ========= -9.2.2 - in progress +9.2.2 -- 2020-01-31 ------------------- - * pick: don't create any successors when there were no changes (issue6093), - * metaedit: don't change commit date by default (issue5994), - * rewind: preserve date - * py3: fix setup.py --version - * py3: fix documentation generation - * py3: fix some exception formatting + * 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 - * 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 - * compatibility for changes in upcoming Mercurial 5.3 * 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), + * pick: don't create any successors when there were no changes (issue6093), + * py3: fix documentation generation + * py3: fix setup.py --version + * py3: fix some exception formatting + * rewind: preserve date + * topic: add more options to command synopsis string * 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