Mercurial > evolve
changeset 5321:aca6bdd2ca22
branching: merge stable back into default
evolve 10.0.0 have been released.
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Sat, 09 May 2020 22:20:30 +0800 |
| parents | c2eea89b3f74 (diff) 34c8aa32bc56 (current diff) |
| children | 7295f3fa8e83 |
| files | |
| diffstat | 6 files changed, 29 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Sun May 03 15:39:56 2020 +0800 +++ b/.hgtags Sat May 09 22:20:30 2020 +0800 @@ -86,3 +86,4 @@ ef41094c34e162eb32ef24bf66d9776d1112751a 9.2.2 583dc6ef3eb21fbf6574021136f32b8a1163506c 9.3.0 8d955635cf457aaa4810d77740721d4275001f74 9.3.1 +27d57ca8686590867e62e3d42c96bad84a5f56ef 10.0.0
--- a/CHANGELOG Sun May 03 15:39:56 2020 +0800 +++ b/CHANGELOG Sat May 09 22:20:30 2020 +0800 @@ -1,15 +1,30 @@ Changelog ========= -9.4.0 - in progress -------------------- +10.0.0 -- 2020-05-09 +-------------------- * compat: clean up old compatibility code + * compat: compatibility with Mercurial 5.4 + * evolve: add {obsorigin}, a template keyword that works similarly to {obsfate}, but shows predecessors of a changeset - * evolve: fix permission of new cache files using sqlite + * evolve: fix permissions of new cache files using SQLite + * evolve: always create commit when resolving divergence + * evolve: handle relocation during divergence resolution producing no changes + * evolve: provide cache to successorssets() in more cases + * obslog: make --all and --filternonlocal work properly with --no-graph * obslog: add --origin flag to show predecessors instead of successors + * obslog: make --origin flag the default + + * stablerangecache: sanity check subranges + +topic (0.19.0) + + * auto-publish: issue the capabilities in all cases + + * topic: provide cache to successorssets() in one more case 9.3.1 -- 2020-04-08 -------------------
--- a/debian/changelog Sun May 03 15:39:56 2020 +0800 +++ b/debian/changelog Sat May 09 22:20:30 2020 +0800 @@ -1,3 +1,9 @@ +mercurial-evolve (10.0.0-1) unstable; urgency=medium + + * new upstream release + + -- Anton Shestakov <av6@dwimlabs.net> Sat, 09 May 2020 21:07:08 +0800 + mercurial-evolve (9.3.1-2) unstable; urgency=medium * update minimum required version of mercurial in debian/control
--- a/hgext3rd/evolve/metadata.py Sun May 03 15:39:56 2020 +0800 +++ b/hgext3rd/evolve/metadata.py Sat May 09 22:20:30 2020 +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'9.4.0.dev' -testedwith = b'4.6.2 4.7 4.8 4.9 5.0 5.1 5.2 5.3' +__version__ = b'10.0.1.dev' +testedwith = b'4.6.2 4.7 4.8 4.9 5.0 5.1 5.2 5.3 5.4' minimumhgversion = b'4.6' buglink = b'https://bz.mercurial-scm.org/'
--- a/hgext3rd/topic/__init__.py Sun May 03 15:39:56 2020 +0800 +++ b/hgext3rd/topic/__init__.py Sat May 09 22:20:30 2020 +0800 @@ -202,9 +202,9 @@ b'topic.active': b'green', } -__version__ = b'0.19.0.dev' +__version__ = b'0.19.1.dev' -testedwith = b'4.6.2 4.7 4.8 4.9 5.0 5.1 5.2 5.3' +testedwith = b'4.6.2 4.7 4.8 4.9 5.0 5.1 5.2 5.3 5.4' minimumhgversion = b'4.6' buglink = b'https://bz.mercurial-scm.org/'
--- a/tests/test-evolve-content-divergent-first-changeset.t Sun May 03 15:39:56 2020 +0800 +++ b/tests/test-evolve-content-divergent-first-changeset.t Sat May 09 22:20:30 2020 +0800 @@ -6,7 +6,6 @@ > evolution.allowdivergence = True > EOF - This test file tests the case of content-divergence resolution of changesets that have the null revision as the parent.