Mercurial > public > mercurial-scm > evolve

changeset 6963:70b173f8428d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge with stable
author Anton Shestakov <av6@dwimlabs.net>
date Wed, 27 Nov 2024 17:48:38 +0400
parents a239ea1dfacb (current diff) 572a682d75d5 (diff)
children 04af1642084d
files CHANGELOG hgext3rd/evolve/metadata.py hgext3rd/topic/__init__.py
diffstat 3 files changed, 20 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Nov 22 16:53:42 2024 +0400
+++ b/.hgtags	Wed Nov 27 17:48:38 2024 +0400
@@ -112,3 +112,4 @@
 2d2da4f7742a0da2c2fbd5a95c48937720eeafd4 11.1.3
 ed7c98393e060210689f0b94d79e8b990403b6a9 11.1.4
 6219898ee0ad2ebd1d75500ac9d1b02e5b539de2 11.1.5
+885e8a8414bde9a14dcefbd342a9704e8ace7649 11.1.6
--- a/CHANGELOG	Fri Nov 22 16:53:42 2024 +0400
+++ b/CHANGELOG	Wed Nov 27 17:48:38 2024 +0400
@@ -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.6 -- 2024-11-27
+--------------------
+
+  * evolve: unrelated parts of splits are no longer considered
+    content-divergent, this is a port of an upstream patch included in hg 6.8.2
+
+  * obshashrange: avoid executing too many DELETE requests at once
+  * obshashrange: reset the cache if too many ranges need to be deleted
+
+topic (1.1.6)
+
+  * stack: when stack base is obsolete, pick any successor, even if at random
+
 11.1.5 -- 2024-10-26
 --------------------
 
--- a/debian/changelog	Fri Nov 22 16:53:42 2024 +0400
+++ b/debian/changelog	Wed Nov 27 17:48:38 2024 +0400
@@ -1,3 +1,9 @@
+mercurial-evolve (11.1.6-1) unstable; urgency=medium
+
+  * new upstream release
+
+ -- Anton Shestakov <av6@dwimlabs.net>  Wed, 27 Nov 2024 16:35:08 +0400
+
 mercurial-evolve (11.1.5-1) unstable; urgency=medium
 
   * new upstream release