# HG changeset patch
# User Raphaël Gomès <rgomes@octobus.net>
# Date 1711744740 -3600
# Node ID 0d83955bc8ac1bbf6aa78049c1cb27f6b088127b
# Parent  e4eeb9fedfe31087dbf6982382b27183f42f84d4# Parent  6014602a36abadeec9d5f24a1f2ba741d59233b3
branching: merge stable into default

diff -r e4eeb9fedfe3 -r 0d83955bc8ac .hgsigs
--- a/.hgsigs	Mon Mar 25 16:27:48 2024 +0000
+++ b/.hgsigs	Fri Mar 29 21:39:00 2024 +0100
@@ -259,3 +259,4 @@
 d1d48d18db37106b801ef6cb90955536458e7ffc 0 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
+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
diff -r e4eeb9fedfe3 -r 0d83955bc8ac .hgtags
--- a/.hgtags	Mon Mar 25 16:27:48 2024 +0000
+++ b/.hgtags	Fri Mar 29 21:39:00 2024 +0100
@@ -275,3 +275,4 @@
 d1d48d18db37106b801ef6cb90955536458e7ffc 6.7rc0
 c9ceb4f6025690167bdb245e530de6bac8baae95 6.7
 2e6fde2ed01e63f0de6a5966994fbb60b1f87057 6.7.1
+803e61387e86f103483120df35619bdb175e3482 6.7.2
diff -r e4eeb9fedfe3 -r 0d83955bc8ac mercurial/bundle2.py
--- a/mercurial/bundle2.py	Mon Mar 25 16:27:48 2024 +0000
+++ b/mercurial/bundle2.py	Fri Mar 29 21:39:00 2024 +0100
@@ -1822,7 +1822,11 @@
             chunks.extend([node, fnode])
 
     if chunks:
-        bundler.newpart(b'hgtagsfnodes', data=b''.join(chunks))
+        bundler.newpart(
+            b'hgtagsfnodes',
+            mandatory=False,
+            data=b''.join(chunks),
+        )
 
 
 def addpartrevbranchcache(repo, bundler, outgoing):
diff -r e4eeb9fedfe3 -r 0d83955bc8ac relnotes/6.7
--- a/relnotes/6.7	Mon Mar 25 16:27:48 2024 +0000
+++ b/relnotes/6.7	Fri Mar 29 21:39:00 2024 +0100
@@ -1,3 +1,14 @@
+= Mercurial 6.7.2 =
+
+Exceptional release following a large performance regression when cloning.
+
+We are setting up automated benchmarks to reduce the likelihood of regressions
+of the sort from happening in the future.
+
+ * phases: avoid a potentially costly dictionary interation in some case
+ * phases: update the phase set as we go during retract boundary
+ * bundle2: make the "hgtagsfnodes" part advisory
+
 = Mercurial 6.7.1 =
 
 Exceptional release following a crash found in delta code that can be triggered
diff -r e4eeb9fedfe3 -r 0d83955bc8ac tests/test-tags.t
--- a/tests/test-tags.t	Mon Mar 25 16:27:48 2024 +0000
+++ b/tests/test-tags.t	Fri Mar 29 21:39:00 2024 +0100
@@ -845,7 +845,7 @@
       c4dab0c2fd337eb9191f80c3024830a4889a8f34
       f63cc8fe54e4d326f8d692805d70e092f851ddb1
       40f0358cb314c824a5929ee527308d90e023bc10
-  hgtagsfnodes -- {} (mandatory: True)
+  hgtagsfnodes -- {} (mandatory: False)
   cache:rev-branch-cache -- {} (mandatory: False)
 
 Check that local clone includes cache data