diff README @ 2595:54ac473663ff mercurial-4.1

compat-test: merge with stable

* Blackbox format seems to have change when displaying config CLI options.

* As obsfate template is now only compatible with hg 4.2+, remove all references
to it in test files.

--- a/README	Wed May 31 14:21:18 2017 +0200
+++ b/README	Fri Jun 16 11:42:00 2017 +0200
@@ -105,14 +105,42 @@
     $ 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.4.0 - inprogress
+------------------
+
+ - effect flag: the experiment is now active by default,
+   (see 'hg help -e evolve' to opt out)
+ - 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
+-------------------
+
+ - also backport the "revelant-markers" fix when using "evolve.serveronly"
+
+6.3.0 -- 2017-05-31
 -------------------
 
  - olog: add an 'obslog' alias
@@ -131,11 +159,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
 -------------------