Commit 113ad071 authored by Anton Shestakov's avatar Anton Shestakov
Browse files

branching: merge with stable

Pipeline #22930 passed with stage
in 4 minutes and 48 seconds
......@@ -94,3 +94,4 @@ fb543438704b73b22023a493c9ef76fc8746b796 10.0.1
eadc1d09f2f567fdae7280aefc8cf4cdc4d78cbc 10.2.0.post1
c0ed8e57463875414d1c06f0428d550c4480d289 10.3.0
93dc3cb6884259f91d739a1cfe993a01820c729c 10.3.1
30c8d8e6a7f4056c46a868b47ee949d3bdb48c4c 10.3.2
......@@ -8,7 +8,7 @@ Changelog
* evolve: use a more stable criteria for picking p1 when solving
content-divergence (most recent evolution will be used).
10.3.2 - in progress
10.3.2 -- 2021-05-28
--------------------
* next: remove duplicated targets when updating from an unstable changeset
......
mercurial-evolve (10.3.2-1) unstable; urgency=medium
* new upstream release
-- Anton Shestakov <av6@dwimlabs.net> Fri, 28 May 2021 16:16:07 +0800
mercurial-evolve (10.3.1-1) unstable; urgency=medium
* new upstream release
......
......@@ -233,7 +233,7 @@ colortable = {b'topic.active': b'green',
__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'
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 5.8'
minimumhgversion = b'4.6'
buglink = b'https://bz.mercurial-scm.org/'
......
......@@ -150,7 +150,6 @@ testing simple pull
cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
$ rm ../server/.hg/blackbox.log
$ hg blackbox
* @0000000000000000000000000000000000000000 (*)> 0/0 cache hits/lookups in *.???? seconds (glob)
* @0000000000000000000000000000000000000000 (*)> clone *ssh://user@dummy/server* client exited 0 after *.?? seconds (glob)
* @0000000000000000000000000000000000000000 (*)> pull --rev 4 (glob)
* @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (5r, 3o) (glob)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment