Mercurial > evolve

diff CHANGELOG @ 4311:8aa28e68ac44 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: detect unresolved conflict during evolve --continue (issue5966) Evolve --continue was ignoring unresolved conflict, proceeding with its operation without any check. This is now fixed. This test case was built and formalized by Matt Harbison and Anton Shestakov.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 21 Dec 2018 13:14:59 +0800
parents 699e25687cc5
children 97b18934d6db
line wrap: on
line diff
--- a/CHANGELOG	Fri Dec 21 19:48:01 2018 +0100
+++ b/CHANGELOG	Fri Dec 21 13:14:59 2018 +0800
@@ -4,6 +4,7 @@
 8.3.3 - in progress
 -------------------
 
+  * evolve: properly detect unresolved merge conflict (issue-5966)
   * evolve: fix possible crash when the repo changes during evolve (issue-6028)
   * test: avoid leaking `hg serve` process
   * topic: fix error message for the `ngtip` revset