changeset 6599:6035b539aa3b

branching: merge with stable
author Anton Shestakov <av6@dwimlabs.net>
date Mon, 23 Oct 2023 15:29:27 -0300
parents 1ecb25d771df (current diff) 536d950753e6 (diff)
children 421dc5c11108
files hgext3rd/evolve/metadata.py hgext3rd/topic/__init__.py
diffstat 5 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Oct 18 15:55:06 2023 -0300
+++ b/.hgtags	Mon Oct 23 15:29:27 2023 -0300
@@ -106,3 +106,4 @@
 eb221b2c1f8196effb48a61d9d83565b878308fd 11.0.0
 33f24dd8cfa2c57a7da2fa6757ba41ffc69da794 11.0.1
 b9355f6f3093c0cf9698215f05059321880f28da 11.0.2
+a625eb5acea4d682becd21759170306ab769afb2 11.1.0
--- a/CHANGELOG	Wed Oct 18 15:55:06 2023 -0300
+++ b/CHANGELOG	Mon Oct 23 15:29:27 2023 -0300
@@ -1,7 +1,7 @@
 Changelog
 =========
 
-11.1.0 - in progress
+11.1.0 -- 2023-10-23
 --------------------
 
   * remove deprecated evolve.serveronly extension, evolve extension is
--- a/debian/changelog	Wed Oct 18 15:55:06 2023 -0300
+++ b/debian/changelog	Mon Oct 23 15:29:27 2023 -0300
@@ -1,3 +1,9 @@
+mercurial-evolve (11.1.0-1) unstable; urgency=medium
+
+  * new upstream release
+
+ -- Anton Shestakov <av6@dwimlabs.net>  Mon, 23 Oct 2023 13:35:40 -0300
+
 mercurial-evolve (11.0.2-1) unstable; urgency=medium
 
   * new upstream release
--- a/hgext3rd/evolve/metadata.py	Wed Oct 18 15:55:06 2023 -0300
+++ b/hgext3rd/evolve/metadata.py	Mon Oct 23 15:29:27 2023 -0300
@@ -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__ = b'11.1.0.dev0'
+__version__ = b'11.2.0.dev0'
 testedwith = b'4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 6.0 6.1 6.2 6.3 6.4 6.5'
 minimumhgversion = b'4.9'
 buglink = b'https://bz.mercurial-scm.org/'
--- a/hgext3rd/topic/__init__.py	Wed Oct 18 15:55:06 2023 -0300
+++ b/hgext3rd/topic/__init__.py	Mon Oct 23 15:29:27 2023 -0300
@@ -236,7 +236,7 @@
               b'log.topic': b'green_background',
               }
 
-__version__ = b'1.1.0.dev0'
+__version__ = b'1.2.0.dev0'
 
 testedwith = b'4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 6.0 6.1 6.2 6.3 6.4 6.5'
 minimumhgversion = b'4.9'