--- a/.hgtags Wed May 31 12:09:24 2017 +0200
+++ b/.hgtags Thu Jun 01 02:48:58 2017 +0200
@@ -51,3 +51,4 @@
8510d3fd7c3b312dc731f4c29badc415d504558a 6.1.0
d4ee0274a8efbaf3d73a659998248c379c61c2bf 6.2.0
0af99106b0754426913b5c82fb52dc70d4d299f6 6.2.1
+6da4ca7b3e4fc214a363a5cf723554f114b7f51e 6.3.0
--- a/README Wed May 31 12:09:24 2017 +0200
+++ b/README Thu Jun 01 02:48:58 2017 +0200
@@ -105,14 +105,23 @@
$ cd tests
$ python $HGSRC/tests/run-tests.py
-(evolve's stable and default branches correspond to Mercurial's stable
-and default branches. So to test evolve from default, you need
-Mercurial on default.), Older version of Mercurial are supportd on their respective ``mercurial-x.y`` branches.
+Branch policy
+-------------
+
+The evolve test are highly impacted by changes in core. To deal with this, we use named branches.
+
+There are two main branches: "stable" and "default". Tests on these branch are
+supposed to pass with the corresponding "default" and "stable" branch from core
+Mercurial. The documentation is built from the tip of stable.
+
+In addition, we have compatibility branches to check tests on older version of
+Mercurial. They are the "mercurial-x.y" branches. They are used to apply
+expected test change only, no code change should happen there.
Changelog
=========
-6.3.0 - in progress
+6.3.0 -- 2017-05-31
-------------------
- olog: add an 'obslog' alias
@@ -131,11 +140,7 @@
- template: add a 'obsfate' template that display how a changeset has evolved
- new discovery experiment: add options to restrict memory consumption on
large repository (see "hg help -e evolve" for details).
-
-6.2.2 - in progress
--------------------
-
- * evolve: fix --rev handling in --list mode
+ - evolve: fix --rev handling in --list mode
6.2.1 -- 2017-05-23
-------------------
--- a/debian/changelog Wed May 31 12:09:24 2017 +0200
+++ b/debian/changelog Thu Jun 01 02:48:58 2017 +0200
@@ -1,3 +1,9 @@
+mercurial-evolve (6.3.0-1) unstable; urgency=medium
+
+ * New upstream release
+
+ -- Pierre-Yves David <pierre-yves.david@ens-lyon.org> Wed, 31 May 2017 14:33:33 +0200
+
mercurial-evolve (6.2.1-1) unstable; urgency=medium
* new upstream release
--- a/hgext3rd/evolve/metadata.py Wed May 31 12:09:24 2017 +0200
+++ b/hgext3rd/evolve/metadata.py Thu Jun 01 02:48:58 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.3.0.dev'
+__version__ = '6.3.1.dev'
testedwith = '3.8.4 3.9.2 4.0.2 4.1.2 4.2'
minimumhgversion = '3.8'
buglink = 'https://bz.mercurial-scm.org/'