Mercurial > evolve

changeset 3851:9ebed1e95ef7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changelog: add a changelog entry about divergence resolution We made a lots of progress there.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 14 Jun 2018 02:58:30 +0200
parents 340cf6fbe9e9
children 629558d09898
files CHANGELOG
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGELOG	Thu Jun 14 01:39:33 2018 +0530
+++ b/CHANGELOG	Thu Jun 14 02:58:30 2018 +0200
@@ -5,11 +5,15 @@
 -------------------
 
   * evolve: handle branch changes when solving content divergence,
+  * evolve: improve multiple aspect of divergence resolution
+            * branch changes handling,
+            * parent changes handling,
+            * divergent stack handling,
   * evolve: add a help section dedicated to interrupted evolve,
   * evolve: merge commit messages when resolving content divergence (issue5877)
   * evolve: show unfinished state information in `hg status -v` (issue5886)
   * evolve: add a new `--no-update` flag to keep working copy on the initial
-           revision.
+            revision.
 
 8.0.1 -- 2018-06-11
 -------------------