diff README @ 929:306f67906a6c stable

merge with all other change to 3.3

--- a/README	Sun May 11 01:14:34 2014 -0700
+++ b/README	Sun May 11 01:17:02 2014 -0700
@@ -29,7 +29,12 @@
 ==========
 
 The simplest way to contribute is to issue a pull request on Bitbucket
-(https://bitbucket.org/marmoute/mutable-history).
+(https://bitbucket.org/marmoute/mutable-history). Please don't forget
+to update and run the tests when you fix a bug or add a feature. To
+run the tests:
+
+    cd tests
+    python run-tests.py --with-hg=/path/to/hg
 
 However, some cutting-edge changes may be found in a mutable repository hosted
 by logilab before they are published.
@@ -42,9 +47,24 @@
 Changelog
 =========
 
-3.3.0 --
+3.3.2 --
+
+- fix a bug where evolve were creating changeset with 2 parents on windows
+  (fix issues #16, #35 and #42)
+
+3.3.1 -- 2014-04-23
+
+- various language fix
+- active bookmark now move when using prev/next (#37)
+- fix some preservation of rename information on evolve (#33)
+- abort when evolve tries to move a node on top of itself (will helps on the #35 front)
+- fold: enable --date and --user options
+
+3.3.0 -- 2014-03-04
 
 - raise Mercurial's minimal requirement to 2.7
+- drop `latercomer` and `conflicting` compatibility. Those old alias are
+  deprecated for a long time now.
 - add verbose hint about how to handle corner case by hand.
   This should help people until evolve is able to to it itself.
 - removed the qsync extension. The only user I knew about (logilab) is not