changeset 7159:56aa9ae361df

branching: merge with stable
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 11 Mar 2025 23:03:26 +0400
parents cc80c5c793a7 (current diff) 564de342008f (diff)
children 8ff5901b0376
files CHANGELOG hgext3rd/evolve/metadata.py hgext3rd/topic/__init__.py
diffstat 5 files changed, 18 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags
+++ b/.hgtags
@@ -115,3 +115,4 @@
 885e8a8414bde9a14dcefbd342a9704e8ace7649 11.1.6
 3ea6267f54f19546fee70190c9fcf58ed6fa74a3 11.1.7
 175b1a7325335e651d3e25eb9f5487429c64706c 11.1.7.post1
+4f273a1ee194cf9ddcb6f91cfd245b8c158f7f82 11.1.8
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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.8 -- 2025-03-11
+--------------------
+
+  * compatibility with Mercurial 7.0
+
+topic (1.1.8)
+
+  * compatibility with Mercurial 7.0
+
 11.1.7.post1 -- 2025-02-06
 --------------------------
 
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mercurial-evolve (11.1.8-1) unstable; urgency=medium
+
+  * new upstream release
+
+ -- Anton Shestakov <av6@dwimlabs.net>  Tue, 11 Mar 2025 14:57:01 +0400
+
 mercurial-evolve (11.1.7.post1-1) unstable; urgency=medium
 
   * new upstream release
--- a/hgext3rd/evolve/metadata.py
+++ b/hgext3rd/evolve/metadata.py
@@ -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 6.8 6.9'
+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 6.9 7.0'
 minimumhgversion = b'5.6'
 buglink = b'https://bz.mercurial-scm.org/'
--- a/hgext3rd/topic/__init__.py
+++ b/hgext3rd/topic/__init__.py
@@ -241,7 +241,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 6.8 6.9'
+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 6.9 7.0'
 minimumhgversion = b'5.6'
 buglink = b'https://bz.mercurial-scm.org/'