Mercurial > evolve
changeset 5953:daca8f4f7014
branching: merge with stable
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Sat, 29 May 2021 14:32:05 +0800 |
| parents | aff365171309 (current diff) b81fea3d59ca (diff) |
| children | fb90474ec53f |
| files | CHANGELOG hgext3rd/evolve/metadata.py hgext3rd/topic/__init__.py tests/test-discovery-obshashrange.t |
| diffstat | 5 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue May 25 18:46:09 2021 +0200 +++ b/.hgtags Sat May 29 14:32:05 2021 +0800 @@ -94,3 +94,4 @@ eadc1d09f2f567fdae7280aefc8cf4cdc4d78cbc 10.2.0.post1 c0ed8e57463875414d1c06f0428d550c4480d289 10.3.0 93dc3cb6884259f91d739a1cfe993a01820c729c 10.3.1 +30c8d8e6a7f4056c46a868b47ee949d3bdb48c4c 10.3.2
--- a/CHANGELOG Tue May 25 18:46:09 2021 +0200 +++ b/CHANGELOG Sat May 29 14:32:05 2021 +0800 @@ -8,7 +8,7 @@ * 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
--- a/debian/changelog Tue May 25 18:46:09 2021 +0200 +++ b/debian/changelog Sat May 29 14:32:05 2021 +0800 @@ -1,3 +1,9 @@ +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
--- a/hgext3rd/topic/__init__.py Tue May 25 18:46:09 2021 +0200 +++ b/hgext3rd/topic/__init__.py Sat May 29 14:32:05 2021 +0800 @@ -233,7 +233,7 @@ __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/'
--- a/tests/test-discovery-obshashrange.t Tue May 25 18:46:09 2021 +0200 +++ b/tests/test-discovery-obshashrange.t Sat May 29 14:32:05 2021 +0800 @@ -150,7 +150,6 @@ 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)