changeset 6822:ed00ed185249

branching: merge with stable
author Anton Shestakov <av6@dwimlabs.net>
date Fri, 28 Jun 2024 19:05:24 +0400
parents b88cd2f549a8 (current diff) 08947ff0c019 (diff)
children 47c7b5ccabd0
files CHANGELOG hgext3rd/evolve/metadata.py hgext3rd/topic/__init__.py hgext3rd/topic/topicmap.py
diffstat 5 files changed, 18 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Jun 26 00:12:58 2024 +0400
+++ b/.hgtags	Fri Jun 28 19:05:24 2024 +0400
@@ -110,3 +110,4 @@
 369e248b6312cc3b0777033a4632f2c9e18a0897 11.1.1
 c31c6638381080bc5905fad37545610fde3b98bc 11.1.2
 2d2da4f7742a0da2c2fbd5a95c48937720eeafd4 11.1.3
+ed7c98393e060210689f0b94d79e8b990403b6a9 11.1.4
--- a/CHANGELOG	Wed Jun 26 00:12:58 2024 +0400
+++ b/CHANGELOG	Fri Jun 28 19:05:24 2024 +0400
@@ -7,6 +7,15 @@
   * evolve: remove legacy.py that could be used to "detect and convert
     prehistoric format of obsolete markers" (older than Mercurial 2.3)
 
+11.1.4 -- 2024-06-28
+--------------------
+
+  * compatibility with Mercurial 6.8
+
+topic (1.1.4)
+
+  * compatibility with Mercurial 6.8
+
 11.1.3 -- 2024-04-12
 --------------------
 
--- a/debian/changelog	Wed Jun 26 00:12:58 2024 +0400
+++ b/debian/changelog	Fri Jun 28 19:05:24 2024 +0400
@@ -1,3 +1,9 @@
+mercurial-evolve (11.1.4-1) unstable; urgency=medium
+
+  * new upstream release
+
+ -- Anton Shestakov <av6@dwimlabs.net>  Fri, 28 Jun 2024 17:01:09 +0400
+
 mercurial-evolve (11.1.3-1) unstable; urgency=medium
 
   * new upstream release
--- a/hgext3rd/evolve/metadata.py	Wed Jun 26 00:12:58 2024 +0400
+++ b/hgext3rd/evolve/metadata.py	Fri Jun 28 19:05:24 2024 +0400
@@ -6,6 +6,6 @@
 # GNU General Public License version 2 or any later version.
 
 __version__ = b'11.2.0.dev0'
-testedwith = b'5.6 5.7 5.8 5.9 6.0 6.1 6.2 6.3 6.4 6.5 6.6 6.7'
+testedwith = b'5.6 5.7 5.8 5.9 6.0 6.1 6.2 6.3 6.4 6.5 6.6 6.7 6.8'
 minimumhgversion = b'5.6'
 buglink = b'https://bz.mercurial-scm.org/'
--- a/hgext3rd/topic/__init__.py	Wed Jun 26 00:12:58 2024 +0400
+++ b/hgext3rd/topic/__init__.py	Fri Jun 28 19:05:24 2024 +0400
@@ -240,7 +240,7 @@
 
 __version__ = b'1.2.0.dev0'
 
-testedwith = b'5.6 5.7 5.8 5.9 6.0 6.1 6.2 6.3 6.4 6.5 6.6 6.7'
+testedwith = b'5.6 5.7 5.8 5.9 6.0 6.1 6.2 6.3 6.4 6.5 6.6 6.7 6.8'
 minimumhgversion = b'5.6'
 buglink = b'https://bz.mercurial-scm.org/'