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

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

diff -r 845a461728c9 -r ce765eb3cfd2 hgext3rd/evolve/metadata.py
--- a/hgext3rd/evolve/metadata.py	Thu Mar 11 18:56:59 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.1.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 845a461728c9 -r ce765eb3cfd2 hgext3rd/topic/__init__.py
--- a/hgext3rd/topic/__init__.py	Thu Mar 11 18:56:59 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.1.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 845a461728c9 -r ce765eb3cfd2 tests/test-evolve-interrupted.t
--- a/tests/test-evolve-interrupted.t	Thu Mar 11 18:56:59 2021 +0800
+++ b/tests/test-evolve-interrupted.t	Fri Mar 12 18:07:48 2021 +0800
@@ -48,7 +48,7 @@
   transaction abort!
   rollback completed
   abort: precommit hook exited with status 1
-  [255]
+  [40]
   $ hg l
   @  2 apricot and blueberry
   
@@ -107,7 +107,7 @@
   transaction abort!
   rollback completed
   abort: precommit hook exited with status 1
-  [255]
+  [40]
   $ cat b
   banana
   $ hg evolve --stop
@@ -132,7 +132,7 @@
   transaction abort!
   rollback completed
   abort: precommit hook exited with status 1
-  [255]
+  [40]
   $ hg evolve --continue
   evolving 1:e0486f65907d "banana"
   working directory is now at bd5ec7dfc2af
diff -r 845a461728c9 -r ce765eb3cfd2 tests/test-prev-next.t
--- a/tests/test-prev-next.t	Thu Mar 11 18:56:59 2021 +0800
+++ b/tests/test-prev-next.t	Fri Mar 12 18:07:48 2021 +0800
@@ -431,7 +431,7 @@
   $ hg prev
   abort: conflicting changes
   (do you want --merge?)
-  [255]
+  [20]
 
   $ echo hi > bar
   $ hg prev
@@ -443,7 +443,7 @@
   $ hg next
   abort: conflicting changes
   (do you want --merge?)
-  [255]
+  [20]
 
 Test that --merge still works fine with commands.update.check set
 
@@ -454,7 +454,7 @@
   $ hg next
   abort: conflicting changes
   (do you want --merge?)
-  [255]
+  [20]
   $ hg next --merge
   merging bar
   warning: conflicts while merging bar! (edit, then use 'hg resolve --mark')