# HG changeset patch
# User Raphaël Gomès <rgomes@octobus.net>
# Date 1708700270 -3600
# Node ID 69ad1d1d9947390a281a3a0da3014a7205583010
# Parent  d1fb42a716763f01adb22903f97574f31ae0e971# Parent  6a98abbb95ee0504ff50d42f94b8aa9a2b9abfa5
branching: merge stable into default

diff -r d1fb42a71676 -r 69ad1d1d9947 .hgsigs
--- a/.hgsigs	Fri Feb 23 15:09:18 2024 +0100
+++ b/.hgsigs	Fri Feb 23 15:57:50 2024 +0100
@@ -256,3 +256,4 @@
 71bd09bebbe36a09569cbfb388f371433360056b 0 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
+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
diff -r d1fb42a71676 -r 69ad1d1d9947 .hgtags
--- a/.hgtags	Fri Feb 23 15:09:18 2024 +0100
+++ b/.hgtags	Fri Feb 23 15:57:50 2024 +0100
@@ -272,3 +272,4 @@
 71bd09bebbe36a09569cbfb388f371433360056b 6.6.1
 136902b3a95db38854ebaf5198a627641065c2ea 6.6.2
 3fd1efb3ad124e6686c0fb66e6943cd8aeea5681 6.6.3
+d1d48d18db37106b801ef6cb90955536458e7ffc 6.7rc0
diff -r d1fb42a71676 -r 69ad1d1d9947 relnotes/6.7
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/relnotes/6.7	Fri Feb 23 15:57:50 2024 +0100
@@ -0,0 +1,75 @@
+= Mercurial 6.7rc0 =
+
+/!\ These are **tentative** release notes for the upcoming Mercurial 6.7.
+Anything can be added or removed before the actual release.
+
+As usual, a *lot* of patches don't make it to this list.
+
+== New Features ==
+
+ * JSON templates can now use structured diffstat data
+ * Support rhg status --rev --rev
+ * The index for REVLOGv1 now has a Rust implementation
+ * Improved `hg censor`'s output
+ * censor: add a command flag to skip the head checks
+ * censor: accept multiple revision in a single call
+ * usage: add a `usage.repository-role` config
+ * branchmap: use mmap for faster revbranchcache loading
+ * crecord: enable search hotkeys (issue6834)
+ * hg-core: separate timestamp and extra methods
+ * annotate: limit output to range of lines
+ * unbundle: faster computation of changed heads
+ * Large improvements of some of the phases code (23950e39281f)
+
+== New Experimental Features ==
+
+ * Introduce `hg admin::chainsaw-update` for automation and *advanced* users
+
+== Bug Fixes ==
+
+ * templatekw: fix inconsistency of diffstat with diff.merge
+ * The endless stream of Python 3 cleanups continues
+ * Improved setup.py robustness
+ * Improved test suite robustness
+ * add: don't attempt to add back removed files unless explicitly listed
+ * statprof: handle `lineno == None` in more cases
+ * rust: fix cargo doc for hg-cpython
+ * rust-python-index: don't panic on a corrupted index when calling from Python
+ * debugindexstats: handle the lack of Rust support better
+ * matchers: use correct method for finding index in vector
+ * narrow: strip trailing `/` from manifest dir before matching it
+ * cext: fix potential memory leaks of list items appended with PyList_Append
+ * doc: document that labels must have a dot in them to have an effect
+ * debugformat: fix formatting for compression level
+
+== Backwards Compatibility Changes ==
+
+Users of the Rust extensions and/or `rhg` should be aware that the new Rust
+index can result in a performance degradation for push/pull on repositories
+*not* using `persistent-nodemap` (see `hg help config.format.use-persistent-nodemap`).
+
+If this is something that matters to you, please reach out to us as this is not
+an insurmountable obstacle. This is a choice base on the assumption that
+there are few people in this situation and our time should be spent on more
+pressing matters.
+
+== Internal API Changes ==
+
+ * 62913:498017baa34b "cleanup: remove some code scheduled to be removed after 5.9"
+ * 62914:88ef80210d67 "cleanup: drop `dirstate.is_changing_parent` deprecated since 6.5"
+ * 62915:591845f89ada "cleanup: drop `path.pushloc` deprecated since 6.5"
+ * 62916:d8f65fc72e7b "cleanup: drop deprecated config attribute on the revlog class"
+ * 62917:5c9c41273367 "cleanup: turn `pathsuboption` deprecation warning into an error"
+ * 62918:7b837fabc990 "cleanup: turn `wrappedfunction` deprecation warning into an error"
+ * 62919:eda075d7b2ac "cleanup: turn `wrapfunction` deprecation warning into an error"
+ * 62920:c845479fc64d "cleanup: drop the `bytes` compatibility for attribute related function"
+ * 63464:dcaa2df1f688 "changelog: never inline changelog"
+ * 63465:a93e52f0b6ff "changelog: disallow delayed write on inline changesets"
+ * 63825:79cd29d598af "dirstate: make the `transaction` argument of `setbranch` mandatory"
+
+== Miscellaneous ==
+
+ * perf: support --template on perf::phases
+ * perf: add a --as-push option to perf::unbundle
+ * debug: add a debug::unbundle command that simulate the unbundle from a push
+ * Lots of refactorings to prepare for performance improvements and remove tech debt
diff -r d1fb42a71676 -r 69ad1d1d9947 relnotes/next
--- a/relnotes/next	Fri Feb 23 15:09:18 2024 +0100
+++ b/relnotes/next	Fri Feb 23 15:57:50 2024 +0100
@@ -13,8 +13,6 @@
 
 == Backwards Compatibility Changes ==
 
-* remove the experimental infinite push extension
-
 == Internal API Changes ==
 
 == Miscellaneous ==