changeset 4520:36632d514af2

branching: merge stable into default

--- a/.hgtags	Fri Apr 12 02:07:53 2019 +0200
+++ b/.hgtags	Fri Apr 12 02:21:09 2019 +0200
@@ -77,3 +77,4 @@
 7edc5c148df0150087832b861966d658df0b601e 8.3.2
 97b18934d6db9e7e7eaa3fb656c0411d7f43af26 8.3.3
 8c4289d0e91e95b3281c378e1ac3f4ff4678b4d3 8.4.0
+33c617626fd90a0a00e831b4762f64fecb609317 8.5.0

--- a/CHANGELOG	Fri Apr 12 02:07:53 2019 +0200
+++ b/CHANGELOG	Fri Apr 12 02:21:09 2019 +0200
@@ -1,33 +1,31 @@
 Changelog
 =========
 
-8.5.0 - in progress
+8.5.0 -- 2019-04-23
 -------------------
 
-  * evolve: improved support for content-divergence with public changesets,
-  * stack: support ranges in revsets indexing,
-  * pick: add the standard `--tool` option,
-  * stack: improved and speed --children flag up,
-  * stack: mention all divergences too.
-  * evolve: share evolve related cache between `shares`
+  * evolve: fix an recoverable state (issue6053),
+  * evolve: share evolve related cache between `shares`,
+  * evolve: make sure the extensions are only active on repository that
+            enables it (issue6057).
   * evolve: improved compatibility with narrow repositories,
   * evolve: preserve --[no-]update value over --continue,
-  * uncommit: abort if an explicitly given file cannot be uncommitted
-
-8.4.1 - in progress
--------------------
+  * evolve: make sure divergence resolution keep the initial author (issue6113),
+  * evolve: improved support for content-divergence with public changesets,
+  * pick: align working dir branch with the one from the pick result (issue6089),
+  * pick: add the standard `--tool` option,
+  * prune: fix error message when pruning public changesets,
+  * split: preserve phases (issue6048),
+  * touch: fix error message when touching public changesets,
+  * uncommit: abort if an explicitly given file cannot be uncommitted.
 
-  * split: preserve phases (issue6048)
-  * evolve: fix an recoverable state (issue6053)
-  * prune: fix error message when pruning public changesets
-  * touch: fix error message when touching public changesets
-  * evolve: make sure the extensions are only active on repository that
-            enables it. Double check your server configuration (issue6057)
-  * evolve: make sure divergence resolution don't replace the initial author
-            (issue6113)
-  * pick: align working dir branch with the one from the pick result (issue6089)
+topic 0.14.0
 
-8.4.0 -- 2019-12-22
+  * stack: support ranges in revsets indexing,
+  * stack: mention divergences unstability,
+  * stack: improved and speed --children flag up.
+
+8.4.0 -- 2019-01-22
 -------------------
 
   * compat: add compatibility with Mercurial 4.9

--- a/debian/changelog	Fri Apr 12 02:07:53 2019 +0200
+++ b/debian/changelog	Fri Apr 12 02:21:09 2019 +0200
@@ -1,3 +1,9 @@
+mercurial-evolve (8.5.0-1) UNRELEASED; urgency=medium
+
+  * new upstream release
+
+ -- Pierre-Yves David <[e-mail]>  Fri, 12 Apr 2019 02:16:23 +0200
+
 mercurial-evolve (8.4.0-1) unstable; urgency=medium
 
   * new upstream release

--- a/hgext3rd/evolve/metadata.py	Fri Apr 12 02:07:53 2019 +0200
+++ b/hgext3rd/evolve/metadata.py	Fri Apr 12 02:21:09 2019 +0200
@@ -5,7 +5,7 @@
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
-__version__ = '8.5.0.dev'
+__version__ = '8.6.0.dev'
 testedwith = '4.4.2 4.5.2 4.6.2 4.7 4.8 4.9'
 minimumhgversion = '4.4'
 buglink = 'https://bz.mercurial-scm.org/'

--- a/hgext3rd/topic/__init__.py	Fri Apr 12 02:07:53 2019 +0200
+++ b/hgext3rd/topic/__init__.py	Fri Apr 12 02:21:09 2019 +0200
@@ -179,7 +179,7 @@
               'topic.active': 'green',
              }
 
-__version__ = '0.14.0.dev'
+__version__ = '0.15.0.dev'
 
 testedwith = '4.4.2 4.5.2 4.6.2 4.7 4.8 4.9'
 minimumhgversion = '4.4'