# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1615460798 -28800
# Node ID 7dfb3b2670705cccd5303ac27d54b7518be591f0
# Parent  82040a455e71caf61be1e2468322b4ca74df16cb# Parent  845a461728c94c26144528edf8e77b258eb00a55
branching: merge stable into default (preserving test changes on default)

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

diff -r 82040a455e71 -r 7dfb3b267070 hgext3rd/evolve/metadata.py
--- a/hgext3rd/evolve/metadata.py	Tue Mar 09 18:50:10 2021 +0800
+++ b/hgext3rd/evolve/metadata.py	Thu Mar 11 19:06:38 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/'
diff -r 82040a455e71 -r 7dfb3b267070 hgext3rd/topic/__init__.py
--- a/hgext3rd/topic/__init__.py	Tue Mar 09 18:50:10 2021 +0800
+++ b/hgext3rd/topic/__init__.py	Thu Mar 11 19:06:38 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'
diff -r 82040a455e71 -r 7dfb3b267070 tests/test-evolve-interrupted.t
diff -r 82040a455e71 -r 7dfb3b267070 tests/test-prev-next.t