changeset 1719:6ff0454f1f23

merge back with stable
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Mon, 01 Aug 2016 22:55:11 +0200
parents 4565b046b850 (current diff) 54f40b722cf9 (diff)
children fe64e69da57b
files
diffstat 3 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Jun 22 18:22:17 2016 +0100
+++ b/.hgtags	Mon Aug 01 22:55:11 2016 +0200
@@ -40,3 +40,4 @@
 c15d6168412f175568dac89e6ee1cd8434fef906 5.2.1
 bd59cc2ee2039c370a0343f683488cde2a106565 5.3.0
 b21ce82e6f7640c2b38506545968650227d67e9b 5.4.0
+2ad40d972a740a613c4c559104166a015b37cac2 5.4.1
--- a/README	Wed Jun 22 18:22:17 2016 +0100
+++ b/README	Mon Aug 01 22:55:11 2016 +0200
@@ -56,6 +56,10 @@
 Changelog
 =========
 
+5.4.1 -- 2016-08-01
+
+ - compat with Mercurial 3.9
+
 5.4.0 -- 2016-05-06
 
 - Some collaboration with the topic experimental extensions,
--- a/hgext/evolve.py	Wed Jun 22 18:22:17 2016 +0100
+++ b/hgext/evolve.py	Mon Aug 01 22:55:11 2016 +0200
@@ -19,8 +19,8 @@
     - improves some aspect of the early implementation in Mercurial core
 '''
 
-__version__ = '5.4.0'
-testedwith = '3.4.3 3.5.2 3.6.2 3.7.3 3.8.1'
+__version__ = '5.4.1'
+testedwith = '3.4.3 3.5.2 3.6.2 3.7.3 3.8.1 3.9'
 buglink = 'http://bz.selenic.com/'