Mercurial > evolve
changeset 2622:6e5f5de46c50
merge back with stable
(test change from stable has been reverted)
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sat, 17 Jun 2017 01:15:15 +0200 |
| parents | fd35b428edfc (current diff) 9f91f4ea7623 (diff) |
| children | a263f4c0f2ee |
| files | tests/test-drop.t tests/test-evolve-templates.t tests/test-obsolete.t tests/test-wireproto.t |
| diffstat | 7 files changed, 16 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Jun 16 18:38:04 2017 +0200 +++ b/.hgtags Sat Jun 17 01:15:15 2017 +0200 @@ -53,3 +53,4 @@ 0af99106b0754426913b5c82fb52dc70d4d299f6 6.2.1 6da4ca7b3e4fc214a363a5cf723554f114b7f51e 6.3.0 e358c0263e4629746a7c925429c951f67d4b02b1 6.3.1 +e60248f26f923f4460682252f7863ff86f7b86b0 6.4.0
--- a/README Fri Jun 16 18:38:04 2017 +0200 +++ b/README Sat Jun 17 01:15:15 2017 +0200 @@ -121,18 +121,15 @@ Changelog ========= -6.4.0 - inprogress ------------------- +6.4.0 -- 2017-06-16 +------------------- + - template: signifiant improvement to the '{obsfate}' template (now 4.2+ only) + - template: fix 'successors' and 'precursors' template to expose hex-node - effect flag: the experiment is now active by default, (see 'hg help -e evolve' to opt out) + - effect flag: fix a small bug related to hidden changeset, - obscache: reduce impact on large repository - - template: signifiant improvement to the '{obsfate}' template (now 4.2+ only) - -6.3.2 - in progress -------------------- - - - effect flag: fix a small bug related to hidden changeset, - obshashrange: install a '.max-revs' option see extension help for details 6.3.1 -- 2017-06-01
--- a/debian/changelog Fri Jun 16 18:38:04 2017 +0200 +++ b/debian/changelog Sat Jun 17 01:15:15 2017 +0200 @@ -1,3 +1,9 @@ +mercurial-evolve (6.4.0-1) unstable; urgency=medium + + * new upstream release + + -- Pierre-Yves David <pierre-yves.david@ens-lyon.org> Fri, 16 Jun 2017 20:14:13 +0200 + mercurial-evolve (6.3.1-1) unstable; urgency=medium * new upstream release
--- a/debian/copyright Fri Jun 16 18:38:04 2017 +0200 +++ b/debian/copyright Sat Jun 17 01:15:15 2017 +0200 @@ -1,5 +1,5 @@ This software was downloaded from -http://hg.netv6.net/evolve-main/ +https://www.mercurial-scm.org/repo/evolve/ Copyright 2011 Peter Arrenbrecht <peter.arrenbrecht@gmail.com> Logilab SA <contact@logilab.fr>
--- a/docs/index.rst Fri Jun 16 18:38:04 2017 +0200 +++ b/docs/index.rst Sat Jun 17 01:15:15 2017 +0200 @@ -113,7 +113,7 @@ #. Clone the ``evolve`` repository:: cd ~/src - hg clone http://hg.netv6.net/evolve-main + hg clone https://www.mercurial-scm.org/repo/evolve #. Configure the extension, either locally ::
--- a/hgext3rd/evolve/metadata.py Fri Jun 16 18:38:04 2017 +0200 +++ b/hgext3rd/evolve/metadata.py Sat Jun 17 01:15:15 2017 +0200 @@ -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__ = '6.4.0.dev' +__version__ = '6.4.0' testedwith = '3.8.4 3.9.2 4.0.2 4.1.2 4.2' minimumhgversion = '3.8' buglink = 'https://bz.mercurial-scm.org/'
--- a/hgext3rd/evolve/obscache.py Fri Jun 16 18:38:04 2017 +0200 +++ b/hgext3rd/evolve/obscache.py Sat Jun 17 01:15:15 2017 +0200 @@ -492,7 +492,7 @@ repo.ui.log('evoext-cache', 'obscache is out of date, ' 'falling back to slower obsstore version\n') - repo.ui.debug('obscache is out of date') + repo.ui.debug('obscache is out of date\n') return orig(repo) else: # If a transaction is open, it is worthwhile to update and use