diff README @ 1578:ec4fae88831d stable

merge with the rest of stable

--- a/README	Wed Dec 30 03:48:11 2015 +0530
+++ b/README	Sun Jan 03 15:51:36 2016 +0100
@@ -42,10 +42,15 @@
 for guidelines on the patch description.
 
 Please don't forget to update and run the tests when you fix a bug or
-add a feature. To run the tests:
+add a feature. To run the tests, you need a working copy of Mercurial,
+say in $HGSRC:
 
     cd tests
-    python run-tests.py --with-hg=/path/to/hg
+    python $HGSRC/tests/run-tests.py --with-hg=$HGSRC/hg
+
+(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.)
 
 
 Changelog
@@ -55,6 +60,11 @@
 
 - split: add a new command to split changesets
 
+5.2.2 --
+
+- no longer lock the repository for `hg parents` (issue4895)
+- updated help for the `evolve` command
+
 5.2.1 -- 2015-11-02
 
 - add compatibility with Mercurial 3.6