# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1446424780 0
# Node ID 829fbd4a72758b012f421c793c551386323f379d
# Parent  a1f239a93c9431aadaa63a3aeba387b450d5356b# Parent  681f675401ff79dbe6d5129c3789bd013aa2b982
merge back with stable

diff -r a1f239a93c94 -r 829fbd4a7275 .hgtags
--- a/.hgtags	Mon Nov 02 00:32:44 2015 +0000
+++ b/.hgtags	Mon Nov 02 00:39:40 2015 +0000
@@ -37,3 +37,4 @@
 c79bdc8563509cd4e99946593d0b39af40271a30 5.2.0
 00026533ff9f52733a45df008e3d56a5d3a8e76a 5.2.0
 44a9dcb3fefcf8281ebe4e359e7dbb637512cf7f 5.2.0
+c15d6168412f175568dac89e6ee1cd8434fef906 5.2.1
diff -r a1f239a93c94 -r 829fbd4a7275 README
--- a/README	Mon Nov 02 00:32:44 2015 +0000
+++ b/README	Mon Nov 02 00:39:40 2015 +0000
@@ -54,14 +54,14 @@
 5.3.0 --
 
 - split: add a new command to split changesets
-- add some progress data during changesets discovery
-- take advantage of dirstate/transaction collaboration
 
-5.2.1 --
+5.2.1 -- 2015-11-02
 
 - add compatibility with Mercurial 3.6
 - prune: fixed possible issue with lock and bookmark
 - next/prev: fixed possible issue with lock and bookmark
+- add some progress data during changesets discovery
+- take advantage of dirstate/transaction collaboration
 
 5.2.0 -- 2015-06-25
 
diff -r a1f239a93c94 -r 829fbd4a7275 hgext/evolve.py
--- a/hgext/evolve.py	Mon Nov 02 00:32:44 2015 +0000
+++ b/hgext/evolve.py	Mon Nov 02 00:39:40 2015 +0000
@@ -19,7 +19,7 @@
     - improves some aspect of the early implementation in Mercurial core
 '''
 
-__version__ = '5.2.0'
+__version__ = '5.2.1'
 testedwith = '3.4.3 3.5.2 3.6'
 buglink = 'http://bz.selenic.com/'