Mercurial > evolve

changeset 1609:b9e8a47c4d5c stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Readme: mention fix for issue4950
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 11 Feb 2016 00:35:16 +0000
parents f69d8c25eeb7
children 9e93ddf03704
files README
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/README	Thu Feb 11 00:02:39 2016 +0000
+++ b/README	Thu Feb 11 00:35:16 2016 +0000
@@ -66,6 +66,9 @@
 - 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`)
+- evolve: fix divergence resolution when it result in an empty commit
+          (issue4950) (hg-3.5+ only)
+
 
 5.2.2 --