# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1637403064 -10800
# Node ID 9198f447ecae9877133fb5756a3d58fdc713be86
# Parent  221a2563b02f09294ea31b6fea3e8ab08979779e# Parent  ee10973797522c24b20034c358d7191a73704280
branching: merge with stable

diff -r 221a2563b02f -r 9198f447ecae .hgtags
--- a/.hgtags	Tue Nov 16 16:07:41 2021 +0300
+++ b/.hgtags	Sat Nov 20 13:11:04 2021 +0300
@@ -97,3 +97,4 @@
 30c8d8e6a7f4056c46a868b47ee949d3bdb48c4c 10.3.2
 cca465bf6a6a103449aa58deecdffba8e546f7c6 10.3.3
 de530d27554b43c00509696dc7a1496f5129e1a4 10.4.0
+64bb9c4a13d388233d4d6d9b761ece9c6ce77fb3 10.4.1
diff -r 221a2563b02f -r 9198f447ecae CHANGELOG
--- a/CHANGELOG	Tue Nov 16 16:07:41 2021 +0300
+++ b/CHANGELOG	Sat Nov 20 13:11:04 2021 +0300
@@ -1,6 +1,19 @@
 Changelog
 =========
 
+10.4.1 -- 2021-11-19
+--------------------
+
+  * compatibility with Mercurial 6.0
+
+  * documentation: add a help section about making evolve skip
+    content-divergence check with experimental.evolution.allowdivergence.
+  * documentation: mention that pick uses the active topic if it's set
+
+topic (0.23.1)
+
+  * compatibility with Mercurial 6.0
+
 10.4.0 -- 2021-10-12
 --------------------
 
diff -r 221a2563b02f -r 9198f447ecae debian/changelog
--- a/debian/changelog	Tue Nov 16 16:07:41 2021 +0300
+++ b/debian/changelog	Sat Nov 20 13:11:04 2021 +0300
@@ -1,3 +1,9 @@
+mercurial-evolve (10.4.1-1) unstable; urgency=medium
+
+  * new upstream release
+
+ -- Anton Shestakov <av6@dwimlabs.net>  Fri, 19 Nov 2021 16:17:59 +0300
+
 mercurial-evolve (10.4.0-1) unstable; urgency=medium
 
   * new upstream release
diff -r 221a2563b02f -r 9198f447ecae hgext3rd/evolve/__init__.py
--- a/hgext3rd/evolve/__init__.py	Tue Nov 16 16:07:41 2021 +0300
+++ b/hgext3rd/evolve/__init__.py	Sat Nov 20 13:11:04 2021 +0300
@@ -273,6 +273,14 @@
 
     [experimental]
     evolution=all
+
+To prevent users from creating content divergence, a check is performed by
+default on the revisions being rewritten, and the operation is aborted if it
+creates divergence. If users want to allow creating content divergent
+changesets, this check can be turned off by setting the following config::
+
+    [experimental]
+    evolution.allowdivergence=True
 """
 
 import sys
diff -r 221a2563b02f -r 9198f447ecae hgext3rd/evolve/cmdrewrite.py
--- a/hgext3rd/evolve/cmdrewrite.py	Tue Nov 16 16:07:41 2021 +0300
+++ b/hgext3rd/evolve/cmdrewrite.py	Sat Nov 20 13:11:04 2021 +0300
@@ -1341,7 +1341,10 @@
     _(b'[OPTION]... [-r] REV'),
     **compat.helpcategorykwargs('CATEGORY_CHANGE_MANAGEMENT'))
 def cmdpick(ui, repo, *revs, **opts):
-    """move a commit on the top of working directory parent and updates to it."""
+    """move a commit onto the working directory parent and update to it.
+
+    If there is an active topic, it will be used for the resulting changeset.
+    """
 
     cont = opts.get('continue')
     abort = opts.get('abort')
diff -r 221a2563b02f -r 9198f447ecae hgext3rd/evolve/metadata.py
--- a/hgext3rd/evolve/metadata.py	Tue Nov 16 16:07:41 2021 +0300
+++ b/hgext3rd/evolve/metadata.py	Sat Nov 20 13:11:04 2021 +0300
@@ -6,6 +6,6 @@
 # GNU General Public License version 2 or any later version.
 
 __version__ = b'10.5.0.dev'
-testedwith = b'4.7 4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9'
+testedwith = b'4.7 4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 6.0'
 minimumhgversion = b'4.7'
 buglink = b'https://bz.mercurial-scm.org/'
diff -r 221a2563b02f -r 9198f447ecae hgext3rd/topic/__init__.py
--- a/hgext3rd/topic/__init__.py	Tue Nov 16 16:07:41 2021 +0300
+++ b/hgext3rd/topic/__init__.py	Sat Nov 20 13:11:04 2021 +0300
@@ -233,7 +233,7 @@
 
 __version__ = b'0.24.0.dev'
 
-testedwith = b'4.7 4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9'
+testedwith = b'4.7 4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 6.0'
 minimumhgversion = b'4.7'
 buglink = b'https://bz.mercurial-scm.org/'
 
diff -r 221a2563b02f -r 9198f447ecae tests/test-evolve.t
--- a/tests/test-evolve.t	Tue Nov 16 16:07:41 2021 +0300
+++ b/tests/test-evolve.t	Sat Nov 20 13:11:04 2021 +0300
@@ -113,6 +113,14 @@
   
         [experimental]
         evolution=all
+  
+      To prevent users from creating content divergence, a check is performed by
+      default on the revisions being rewritten, and the operation is aborted if
+      it creates divergence. If users want to allow creating content divergent
+      changesets, this check can be turned off by setting the following config:
+  
+        [experimental]
+        evolution.allowdivergence=True
 
 various init
 
diff -r 221a2563b02f -r 9198f447ecae tests/test-pick.t
--- a/tests/test-pick.t	Tue Nov 16 16:07:41 2021 +0300
+++ b/tests/test-pick.t	Sat Nov 20 13:11:04 2021 +0300
@@ -29,7 +29,9 @@
   
   aliases: grab
   
-  move a commit on the top of working directory parent and updates to it.
+  move a commit onto the working directory parent and update to it.
+  
+      If there is an active topic, it will be used for the resulting changeset.
   
   options: