diff README @ 1530:cafa9437a537

merge with stable

--- a/README	Mon Nov 02 11:08:32 2015 +0000
+++ b/README	Fri Nov 06 21:15:15 2015 -0500
@@ -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
@@ -56,6 +61,11 @@
 - split: add a new command to split changesets
 - tests: drop our copy of 'run-tests.py' use core one instead.
 
+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