changeset 6733:50c0f1e2dfb6

branching: merge with stable
author Anton Shestakov <av6@dwimlabs.net>
date Sun, 03 Mar 2024 15:38:03 -0300
parents 920f767589df (current diff) 5b20bc704577 (diff)
children 3076dba01b86
files CHANGELOG hgext3rd/evolve/metadata.py hgext3rd/topic/__init__.py
diffstat 5 files changed, 22 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Sun Feb 25 15:55:13 2024 -0300
+++ b/.hgtags	Sun Mar 03 15:38:03 2024 -0300
@@ -108,3 +108,4 @@
 b9355f6f3093c0cf9698215f05059321880f28da 11.0.2
 a625eb5acea4d682becd21759170306ab769afb2 11.1.0
 369e248b6312cc3b0777033a4632f2c9e18a0897 11.1.1
+c31c6638381080bc5905fad37545610fde3b98bc 11.1.2
--- a/CHANGELOG	Sun Feb 25 15:55:13 2024 -0300
+++ b/CHANGELOG	Sun Mar 03 15:38:03 2024 -0300
@@ -7,6 +7,19 @@
   * evolve: remove legacy.py that could be used to "detect and convert
     prehistoric format of obsolete markers" (older than Mercurial 2.3)
 
+11.1.2 -- 2024-03-03
+--------------------
+
+  * compatibility with Mercurial 6.7
+
+  * evolve: use functions from topic extension to set current topic and tns
+
+topic (1.1.2)
+
+  * compatibility with Mercurial 6.7
+
+  * topic: handle commitstatus() with opts=None for hg <= 6.5 too
+
 11.1.1 -- 2024-02-05
 --------------------
 
--- a/debian/changelog	Sun Feb 25 15:55:13 2024 -0300
+++ b/debian/changelog	Sun Mar 03 15:38:03 2024 -0300
@@ -1,3 +1,9 @@
+mercurial-evolve (11.1.2-1) unstable; urgency=medium
+
+  * new upstream release
+
+ -- Anton Shestakov <av6@dwimlabs.net>  Sun, 03 Mar 2024 15:09:28 -0300
+
 mercurial-evolve (11.1.1-1) unstable; urgency=medium
 
   * new upstream release
--- a/hgext3rd/evolve/metadata.py	Sun Feb 25 15:55:13 2024 -0300
+++ b/hgext3rd/evolve/metadata.py	Sun Mar 03 15:38:03 2024 -0300
@@ -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'
+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'
 minimumhgversion = b'5.6'
 buglink = b'https://bz.mercurial-scm.org/'
--- a/hgext3rd/topic/__init__.py	Sun Feb 25 15:55:13 2024 -0300
+++ b/hgext3rd/topic/__init__.py	Sun Mar 03 15:38:03 2024 -0300
@@ -239,7 +239,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'
+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'
 minimumhgversion = b'5.6'
 buglink = b'https://bz.mercurial-scm.org/'