# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1612009221 -28800
# Node ID f39fd921ecba122705419f26701eb45d2b3c115c
# Parent  572b3f3c4a29780002916ad87e8394e17cc6e0b4# Parent  3fb72f8c66e75f667a4061e3b896b14e5f1de5ef
branching: merge stable into default

diff -r 572b3f3c4a29 -r f39fd921ecba CHANGELOG
--- a/CHANGELOG	Thu Jan 28 18:29:53 2021 +0800
+++ b/CHANGELOG	Sat Jan 30 20:20:21 2021 +0800
@@ -4,12 +4,17 @@
 10.1.1 -- in progress
 ---------------------
 
+  * doc: update the MQ To Evolve guide and fix build warning for index.rst
+
   * evolve: remove spurious "working directory is now at ..." messages
   * evolve: various documentation improvements
 
+  * packaging: default to building docs on Python 3
+
 topic:
 
-  * rebase: prevent in-memory rebase to silently drop topic (by disable the feature)
+  * rebase: prevent in-memory rebase from silently dropping topic (by disabling
+    the feature)
 
 10.2.0 - in progress
 --------------------
diff -r 572b3f3c4a29 -r f39fd921ecba hgext3rd/evolve/headchecking.py
--- a/hgext3rd/evolve/headchecking.py	Thu Jan 28 18:29:53 2021 +0800
+++ b/hgext3rd/evolve/headchecking.py	Sat Jan 30 20:20:21 2021 +0800
@@ -166,7 +166,7 @@
     new_heads.sort()
     return new_heads
 
-def enforcesinglehead(orig, repo, tr, desc, accountclosed, filtername=b'visible'):
+def enforcesinglehead(orig, repo, tr, desc, accountclosed=False, filtername=b'visible'):
     """check that no named branch has multiple heads
 
     COMPAT: this is the same as the upstream version as of c701f616d852, except