Mercurial > evolve

changeset 5623:fe31179e1941 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge into stable in preparation for release
author Anton Shestakov <av6@dwimlabs.net>
date Sat, 31 Oct 2020 17:25:32 +0800
parents 71cc223fd109 (diff) 87ee065a688b (current diff)
children 49c778a5945b
files CHANGELOG README hgext3rd/evolve/compat.py tests/test-topic-push-concurrent-on.t tests/testlib/check-compat-strings.sh
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGELOG	Sat Oct 31 02:34:31 2020 +0800
+++ b/CHANGELOG	Sat Oct 31 17:25:32 2020 +0800
@@ -26,6 +26,7 @@
 --------------------
 
   * evolve: specific the source of config override for `server.bundle1=no`
+  * evolve: avoid leaving mergestate after instability resolution
   * metaedit: update bookmark location when applicable
 
 10.0.2 -- 2020-09-08