changeset 5842:ce765eb3cfd2

branching: redo the stable->default merge (preserving test changes on default)

CORE-TEST-OUTPUT-UPDATE: 768056549737
CORE-TEST-OUTPUT-UPDATE: dc00324e80f4

--- a/.gitlab-ci.yml	Tue Mar 09 18:50:10 2021 +0800
+++ b/.gitlab-ci.yml	Fri Mar 12 18:07:48 2021 +0800
@@ -82,3 +82,14 @@
     artifacts:
         paths:
             - html/*
+
+sdist:
+    stage: .post
+    image: registry.heptapod.net/mercurial/ci-images/py3-hgext3rd
+    script:
+        - python3 setup.py sdist
+    artifacts:
+        paths:
+            - dist/*
+    only:
+        - tags

--- a/.hgtags	Tue Mar 09 18:50:10 2021 +0800
+++ b/.hgtags	Fri Mar 12 18:07:48 2021 +0800
@@ -92,3 +92,4 @@
 782cbadb123fe4991e91a03d367e02d0b5ae969c 10.1.0
 35b883a4ff5a97973eb9e6f00014e71f14cebe70 10.2.0
 eadc1d09f2f567fdae7280aefc8cf4cdc4d78cbc 10.2.0.post1
+c0ed8e57463875414d1c06f0428d550c4480d289 10.3.0

--- a/CHANGELOG	Tue Mar 09 18:50:10 2021 +0800
+++ b/CHANGELOG	Fri Mar 12 18:07:48 2021 +0800
@@ -1,25 +1,30 @@
 Changelog
 =========
 
-10.3.0 - in progress
+10.3.0 -- 2021-03-11
 --------------------
 
+  * doc: document stack as a substitue for MQ's qseries
+  * doc: document revsets provided by evolve extension
+
   * evolve: add a experimental.evolution.in-memory config for running evolve
     in memory (hg >= 5.6)
   * evolve: improve content-divergence resolution that involves parent changes
   * evolve: preserve wdir parent when using `hg evolve --stop`
+
   * obslog: clarify the command name in the help,
+
   * pdiff, pstatus: drop some irrelevant command flags inherited from `hg diff`
     and `hg status` respectively
+
   * rewind: detect and abort on cases when we rewind to changesets that are
     precessors / successors of each other
   * rewind: when user gives only some parts of a fold, include the other parts
     as well, or abort if they are missing from local repo
 
-10.2.1 - in progress
---------------------
+topic (0.22.0)
 
-  * doc: document stack as a substitue for MQ's qseries
+  * doc: change topic phrase 'disappear' to 'fade out'
 
 10.2.0.post1 -- 2021-02-01
 --------------------------

--- a/debian/changelog	Tue Mar 09 18:50:10 2021 +0800
+++ b/debian/changelog	Fri Mar 12 18:07:48 2021 +0800
@@ -1,3 +1,9 @@
+mercurial-evolve (10.3.0-1) unstable; urgency=medium
+
+  * new upstream release
+
+ -- Anton Shestakov <[e-mail]>  Thu, 11 Mar 2021 18:32:26 +0800
+
 mercurial-evolve (10.2.0.post1-1) unstable; urgency=medium
 
   * identical release

--- a/hgext3rd/evolve/evolvecmd.py	Tue Mar 09 18:50:10 2021 +0800
+++ b/hgext3rd/evolve/evolvecmd.py	Fri Mar 12 18:07:48 2021 +0800
@@ -890,7 +890,6 @@
     Each hash in the description will be detected and, if matching an obsolete
     changeset, it will be replaced by its successors.
 
-
     Note: They might be case were such behavior might be is wrong, for example
     if the commit message is explicitely referencing an older, obsolete changesets.
     """
@@ -1061,7 +1060,6 @@
         return None
     return repo.commitctx(memctx)
 
-
 def _finalizerelocate(repo, orig, dest, nodenew, tr, category, evolvestate):
     if nodenew is not None:
         obsolete.createmarkers(repo, [(orig, (repo[nodenew],))],

--- a/hgext3rd/evolve/metadata.py	Tue Mar 09 18:50:10 2021 +0800
+++ b/hgext3rd/evolve/metadata.py	Fri Mar 12 18:07:48 2021 +0800
@@ -5,7 +5,7 @@
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
-__version__ = b'10.3.0.dev'
+__version__ = b'10.4.0.dev'
 testedwith = b'4.6.2 4.7 4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7'
 minimumhgversion = b'4.6'
 buglink = b'https://bz.mercurial-scm.org/'

--- a/hgext3rd/topic/__init__.py	Tue Mar 09 18:50:10 2021 +0800
+++ b/hgext3rd/topic/__init__.py	Fri Mar 12 18:07:48 2021 +0800
@@ -232,7 +232,7 @@
               b'topic.active': b'green',
               }
 
-__version__ = b'0.22.0.dev'
+__version__ = b'0.23.0.dev'
 
 testedwith = b'4.6.2 4.7 4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7'
 minimumhgversion = b'4.6'