# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1634287062 -10800
# Node ID 399ea41d5e37c50a41713200708a3aa180d7b080
# Parent  be2008649675ec61a29aaf5e364a3a18c57927e8# Parent  99153a05e1f5c8c9bae5312b6db5070140e5c508
branching: merge with stable

diff -r be2008649675 -r 399ea41d5e37 .hgtags
--- a/.hgtags	Tue Oct 12 10:19:05 2021 +0300
+++ b/.hgtags	Fri Oct 15 11:37:42 2021 +0300
@@ -96,3 +96,4 @@
 93dc3cb6884259f91d739a1cfe993a01820c729c 10.3.1
 30c8d8e6a7f4056c46a868b47ee949d3bdb48c4c 10.3.2
 cca465bf6a6a103449aa58deecdffba8e546f7c6 10.3.3
+de530d27554b43c00509696dc7a1496f5129e1a4 10.4.0
diff -r be2008649675 -r 399ea41d5e37 CHANGELOG
--- a/CHANGELOG	Tue Oct 12 10:19:05 2021 +0300
+++ b/CHANGELOG	Fri Oct 15 11:37:42 2021 +0300
@@ -1,7 +1,7 @@
 Changelog
 =========
 
-10.4.0 - in progress
+10.4.0 -- 2021-10-12
 --------------------
 
   * evolve: use a more stable criteria for picking p1 when solving
diff -r be2008649675 -r 399ea41d5e37 debian/changelog
--- a/debian/changelog	Tue Oct 12 10:19:05 2021 +0300
+++ b/debian/changelog	Fri Oct 15 11:37:42 2021 +0300
@@ -1,4 +1,10 @@
-mercurial-evolve (10.3.3-1) UNRELEASED; urgency=medium
+mercurial-evolve (10.4.0-1) unstable; urgency=medium
+
+  * new upstream release
+
+ -- Anton Shestakov <av6@dwimlabs.net>  Tue, 12 Oct 2021 17:22:11 +0300
+
+mercurial-evolve (10.3.3-1) unstable; urgency=medium
 
   * new upstream release
 
diff -r be2008649675 -r 399ea41d5e37 hgext3rd/evolve/metadata.py
--- a/hgext3rd/evolve/metadata.py	Tue Oct 12 10:19:05 2021 +0300
+++ b/hgext3rd/evolve/metadata.py	Fri Oct 15 11:37:42 2021 +0300
@@ -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.4.0.dev'
+__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'
 minimumhgversion = b'4.7'
 buglink = b'https://bz.mercurial-scm.org/'
diff -r be2008649675 -r 399ea41d5e37 hgext3rd/topic/__init__.py
--- a/hgext3rd/topic/__init__.py	Tue Oct 12 10:19:05 2021 +0300
+++ b/hgext3rd/topic/__init__.py	Fri Oct 15 11:37:42 2021 +0300
@@ -231,7 +231,7 @@
               b'log.topic': b'green_background',
               }
 
-__version__ = b'0.23.0.dev'
+__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'
 minimumhgversion = b'4.7'