Mercurial > evolve

diff CHANGELOG @ 4857:86cdc5efd769

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge with stable
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 27 Sep 2019 06:55:05 +0200
parents 6f5d3f58fbe4 6d898fa6e5c3
children 40795751be1c
line wrap: on
line diff
--- a/CHANGELOG	Wed Sep 25 19:43:19 2019 +0200
+++ b/CHANGELOG	Fri Sep 27 06:55:05 2019 +0200
@@ -14,6 +14,7 @@
 9.1.1 - in progress
 -------------------
 
+  * evolve: check that relocating makes sense in _solvedivergent() (issue5958)
   * evolve: test that target is not orig in _solveunstable() (issue6097)
   * fold: check allowdivergence before folding obsolete changesets (issue5817)
   * obslog: correct spacing of patch output with word-diff=yes (issue6175)