# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1455151468 0
# Node ID 99077dbb83e008fdf6485ff0edc0993a6769f2a0
# Parent  2a08ef812b84234c3d999114d3db9876f9c39f76# Parent  4bb48b1da1f89c03b45a7926412d69bf9f3cfd48
merge with stable

diff -r 2a08ef812b84 -r 99077dbb83e0 .hgtags
--- a/.hgtags	Thu Feb 04 02:46:40 2016 -0800
+++ b/.hgtags	Thu Feb 11 00:44:28 2016 +0000
@@ -38,3 +38,4 @@
 00026533ff9f52733a45df008e3d56a5d3a8e76a 5.2.0
 44a9dcb3fefcf8281ebe4e359e7dbb637512cf7f 5.2.0
 c15d6168412f175568dac89e6ee1cd8434fef906 5.2.1
+bd59cc2ee2039c370a0343f683488cde2a106565 5.3.0
diff -r 2a08ef812b84 -r 99077dbb83e0 README
--- a/README	Thu Feb 04 02:46:40 2016 -0800
+++ b/README	Thu Feb 11 00:44:28 2016 +0000
@@ -28,17 +28,17 @@
 Contribute
 ==========
 
-Bugs are to be reported on the mercurial's bug tracker: http://bz.selenic.com/
+Bugs are to be reported on the mercurial's bug tracker: http://bz.mercurial-scm.com/
 Use the the "evolution" component.
 
 Please use the patchbomb extension to send email to mercurial devel. Please
 make sure to use the evolve-ext flag when doing so. You can use a command like
 this:
 
-    hg email --to mercurial-devel@selenic.com --flag evolve-ext --rev '<your patches>'
+    hg email --to mercurial-devel@mercurial-scm.org --flag evolve-ext --rev '<your patches>'
 
 See also
-http://mercurial.selenic.com/wiki/ContributingChanges#Patch_descriptions
+http://mercurial-scm.org/wiki/ContributingChanges#Patch_descriptions
 for guidelines on the patch description.
 
 Please don't forget to update and run the tests when you fix a bug or
@@ -56,19 +56,18 @@
 Changelog
 =========
 
-5.3.0 --
+5.3.0 -- 2016-02-11
 
 - split: add a new command to split changesets,
 - tests: drop our copy of 'run-tests.py' use core one instead,
 - bookmark: do all bookmark movement within a transaction.
 - evolve: compatibility with Mercurial 3.7
-- evolve: support merge with a single obsolete parent.
+- evolve: support merge with a single obsolete parent (hg-3.7+ only)
 - evolve: prevent added file to be marked as unknown if evolve fails (issue4966)
 - evolve: stop relying on graftstate file for save evolve state
           (for `hg evolve --continue`)
-
-5.2.2 --
-
+- evolve: fix divergence resolution when it result in an empty commit
+          (issue4950) (hg-3.5+ only)
 - no longer lock the repository for `hg parents` (issue4895)
 - updated help for the `evolve` command
 
diff -r 2a08ef812b84 -r 99077dbb83e0 hgext/evolve.py
--- a/hgext/evolve.py	Thu Feb 04 02:46:40 2016 -0800
+++ b/hgext/evolve.py	Thu Feb 11 00:44:28 2016 +0000
@@ -19,8 +19,8 @@
     - improves some aspect of the early implementation in Mercurial core
 '''
 
-__version__ = '5.2.1'
-testedwith = '3.4.3 3.5.2 3.6'
+__version__ = '5.3.0'
+testedwith = '3.4.3 3.5.2 3.6.2 3.7'
 buglink = 'http://bz.selenic.com/'