changeset 4368:acfd2b1a6176

branching: merge with stable

A new version has been released

--- a/.hgtags	Sat Jan 19 21:41:15 2019 +0100
+++ b/.hgtags	Wed Jan 23 15:49:44 2019 -0500
@@ -76,3 +76,4 @@
 b90422a11a887c6ff756c2a5622ea0a1e260ff4c 8.3.1
 7edc5c148df0150087832b861966d658df0b601e 8.3.2
 97b18934d6db9e7e7eaa3fb656c0411d7f43af26 8.3.3
+8c4289d0e91e95b3281c378e1ac3f4ff4678b4d3 8.4.0

--- a/CHANGELOG	Sat Jan 19 21:41:15 2019 +0100
+++ b/CHANGELOG	Wed Jan 23 15:49:44 2019 -0500
@@ -1,30 +1,33 @@
 Changelog
 =========
 
-8.4.0 - in progress
+8.4.0 -- 2019-12-22
 -------------------
 
-  * split: improve and update the user prompt (BC)
-  * split: make it possible to drop change during a split
-  * split: no longer accept revision with --rev (BC)
-  * split: accept file patterns
-  * split: support for non interactive splits
+  * compat: add compatibility with Mercurial 4.9
+  * compat: drop compatibility with Mercurial 4.3
   * evolve: avoid potential crash when stabilizing orphan merges
-  * evolve: pick right destination in split+prune cases issue5686 (4.9 only)
+  * evolve: pick right destination in split+prune cases issue5686 (hg-4.9 only)
   * evolve: prioritize --rev/--any/--all option over obsolete working directory
   * fold: concatenate commit message in revision order
-  * push: have `--publish` overrule the `auto-publish` config
   * next: evolve aspiring children by default (use --no-evolve to skip)
   * next: pick lower part of a split as destination
-  * compat: drop compatibility with Mercurial 4.3
-  * compat: add compatibility with Mercurial 4.9
-  * topics: improve the message around topic changing
+  * push: have `--publish` overrule the `auto-publish` config
+  * split: accept file patterns
+  * split: improve and update the user prompt (BC)
+  * split: make it possible to drop change during a split
+  * split: no longer accept revision without --rev (BC)
+  * split: support for non interactive splits
+
+topic 0.13.0
+
   * stack: introduce a --children flag (see help for details)
+  * stack: support for '#stack[idx]' absolute indexing in revset (hg-4.9+ only)
+  * topic: support for '#topic[idx]' relative indexing in revset (hg-4.9+ only)
   * topic: make --age compatible with the usual other display for `hg topic`
-  * stack: support for '#stack[idx]' absolute indexing in revset (4.9+ only)
-  * topic: support for '#topic[idx]' relative indexing in revset (4.9+ only)
+  * topics: improve the message around topic changes
 
-8.3.3 -- 2017-12-24
+8.3.3 -- 2018-12-24
 -------------------
 
   * evolve: properly detect unresolved merge conflict (issue-5966)
@@ -32,7 +35,7 @@
   * test: avoid leaking `hg serve` process
   * topic: fix error message for the `ngtip` revset
 
-8.3.2 -- 2017-11-27
+8.3.2 -- 2018-11-27
 -------------------
 
   * evolve: not longer attempt to translate revision's descriptions (issue6016)

--- a/debian/changelog	Sat Jan 19 21:41:15 2019 +0100
+++ b/debian/changelog	Wed Jan 23 15:49:44 2019 -0500
@@ -1,3 +1,9 @@
+mercurial-evolve (8.4.0) UNRELEASED; urgency=medium
+
+  * new upstream release
+
+ -- Pierre-Yves David <[e-mail]>  Tue, 22 Jan 2019 20:24:11 -0500
+
 mercurial-evolve (8.3.3-1) unstable; urgency=medium
 
   * new upstream release

--- a/hgext3rd/evolve/metadata.py	Sat Jan 19 21:41:15 2019 +0100
+++ b/hgext3rd/evolve/metadata.py	Wed Jan 23 15:49:44 2019 -0500
@@ -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.4.0.dev'
+__version__ = '8.5.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/serverminitopic.py	Sat Jan 19 21:41:15 2019 +0100
+++ b/hgext3rd/serverminitopic.py	Wed Jan 23 15:49:44 2019 -0500
@@ -1,5 +1,8 @@
 """enable a minimal verison of topic for server
 
+! This extensions is not actively maintained
+! We recommand using the main topic extension instead
+
 Non publishing repository will see topic as "branch:topic" in the branch field.
 
 In addition to adding the extensions, the feature must be manually enabled in the config:

--- a/hgext3rd/topic/__init__.py	Sat Jan 19 21:41:15 2019 +0100
+++ b/hgext3rd/topic/__init__.py	Wed Jan 23 15:49:44 2019 -0500
@@ -177,9 +177,9 @@
               'topic.active': 'green',
              }
 
-__version__ = '0.13.0.dev'
+__version__ = '0.14.0.dev'
 
-testedwith = '4.4.2 4.5.2 4.6.2 4.7 4.8'
+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/'