Mercurial > evolve

diff CHANGELOG @ 5074:47f9ba943bb1 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changelog: add missing entries
author Anton Shestakov <av6@dwimlabs.net>
date Mon, 20 Jan 2020 22:52:05 +0700
parents a3f692bcbbf4
children 25fc1a2c3dc6
line wrap: on
line diff
--- a/CHANGELOG	Fri Jan 03 23:12:19 2020 +0700
+++ b/CHANGELOG	Mon Jan 20 22:52:05 2020 +0700
@@ -16,6 +16,12 @@
   * 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)
+  * 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
 -------------------