# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1462486974 -7200
# Node ID b09ac378f025f894eb36bc92d6c19be35e0b2c2e
# Parent  5fb7f37b82e6f3024f630aa6aff5fffaf3f9e327# Parent  3460887b68596c99fa6b7c1e66b1cf0c4ee3799a
merge back with stable

diff -r 5fb7f37b82e6 -r b09ac378f025 .hgignore
--- a/.hgignore	Thu May 05 21:54:26 2016 +0200
+++ b/.hgignore	Fri May 06 00:22:54 2016 +0200
@@ -12,3 +12,4 @@
 ^MANIFEST$
 ^docs/tutorials/.*\.rst$
 \.ico$
+tests/\.testtimes
diff -r 5fb7f37b82e6 -r b09ac378f025 .hgtags
--- a/.hgtags	Thu May 05 21:54:26 2016 +0200
+++ b/.hgtags	Fri May 06 00:22:54 2016 +0200
@@ -39,3 +39,4 @@
 44a9dcb3fefcf8281ebe4e359e7dbb637512cf7f 5.2.0
 c15d6168412f175568dac89e6ee1cd8434fef906 5.2.1
 bd59cc2ee2039c370a0343f683488cde2a106565 5.3.0
+b21ce82e6f7640c2b38506545968650227d67e9b 5.4.0
diff -r 5fb7f37b82e6 -r b09ac378f025 README
--- a/README	Thu May 05 21:54:26 2016 +0200
+++ b/README	Fri May 06 00:22:54 2016 +0200
@@ -56,7 +56,7 @@
 Changelog
 =========
 
-5.4.0 -- 
+5.4.0 -- 2016-05-06
 
 - Some collaboration with the topic experimental extensions,
   - hg evolve --all with consider all troubles in your current topic,
diff -r 5fb7f37b82e6 -r b09ac378f025 hgext/evolve.py
--- a/hgext/evolve.py	Thu May 05 21:54:26 2016 +0200
+++ b/hgext/evolve.py	Fri May 06 00:22:54 2016 +0200
@@ -19,8 +19,8 @@
     - improves some aspect of the early implementation in Mercurial core
 '''
 
-__version__ = '5.3.0'
-testedwith = '3.4.3 3.5.2 3.6.2 3.7'
+__version__ = '5.4.0'
+testedwith = '3.4.3 3.5.2 3.6.2 3.7.3 3.8.1'
 buglink = 'http://bz.selenic.com/'