diff relnotes/next @ 45803:84eb4c833c41

merge with stable

--- a/relnotes/next	Tue Oct 13 05:15:44 2020 +0200
+++ b/relnotes/next	Mon Nov 02 14:39:43 2020 -0500
@@ -1,12 +1,5 @@
 == New Features ==
 
- * `hg mv -A` can now be used with `--at-rev`. It behaves just like
-   `hg cp -A --at-rev`, i.e. it marks the destination as a copy of the
-   source whether or not the source still exists (but the source must
-   exist in the parent revision).
-
- * New revset predicate `diffcontains(pattern)` for filtering revisions
-   in the same way as `hg grep --diff pattern`.
 
  * The memory footprint per changeset and per file during pull/unbundle
    operations has been significantly reduced.
@@ -26,9 +19,6 @@
 
 == Internal API Changes ==
 
- * `merge.update()` is now private (renamed to `_update()`). Hopefully
-   the higher-level functions available in the same module cover your
-   use cases.
 
  * `phases.registernew` now takes a set of revisions instead of a list
    of nodes. `phases.advanceboundary` takes an optional set of revisions