# HG changeset patch # User Pierre-Yves David # Date 1462487040 -7200 # Node ID 981d895d69cf9de8a15ffa190c022ef280144fd7 # Parent dd6f090b7342255410e10a7c64c1a3a4cda4c3ed# Parent f89c429345e9ce8a408e8c385233a61b69628db2 merge latest tag in 3.5 branch diff -r dd6f090b7342 -r 981d895d69cf .hgtags --- a/.hgtags Fri May 06 00:00:14 2016 +0200 +++ b/.hgtags Fri May 06 00:24:00 2016 +0200 @@ -39,3 +39,4 @@ 44a9dcb3fefcf8281ebe4e359e7dbb637512cf7f 5.2.0 c15d6168412f175568dac89e6ee1cd8434fef906 5.2.1 bd59cc2ee2039c370a0343f683488cde2a106565 5.3.0 +b21ce82e6f7640c2b38506545968650227d67e9b 5.4.0 diff -r dd6f090b7342 -r 981d895d69cf README --- a/README Fri May 06 00:00:14 2016 +0200 +++ b/README Fri May 06 00:24:00 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 dd6f090b7342 -r 981d895d69cf hgext/evolve.py --- a/hgext/evolve.py Fri May 06 00:00:14 2016 +0200 +++ b/hgext/evolve.py Fri May 06 00:24:00 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/'