diff README @ 1048:a585353a816b stable

merge default into stable

Release 4.1.0 is coming

--- a/README	Fri Aug 08 15:50:26 2014 -0700
+++ b/README	Fri Aug 08 23:14:00 2014 -0700
@@ -29,9 +29,19 @@
 ==========
 
 The simplest way to contribute is to issue a pull request on Bitbucket
-(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:
+(https://bitbucket.org/marmoute/mutable-history). Alternatively, you
+can use the patchbomb extension to send email to mercurial
+devel. Please make sure to use the evolve-ext flag when doing so. You
+can use a command like this:
+
+    hg email --to [e-mail] --flag evolve-ext --rev '<your patches>'
+
+See also
+http://mercurial.selenic.com/wiki/ContributingChanges#Patch_descriptions
+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:
 
     cd tests
     python run-tests.py --with-hg=/path/to/hg
@@ -47,6 +57,19 @@
 Changelog
 =========
 
+4.1.0 --
+
+- amend: add -D/--current-date option
+- amend: add -U/--current-user option
+- evolve: add a --tool option
+- evolve: add a --confirm option
+- mark "commit -o", "graft -o" and "graft -O" as deprecated since they are
+  unlikely to eventually make it into core.
+- push obsmarkers and phases in the same transaction than changesets
+  (when using hg >= 3.1 and bundle2-exp is enabled)
+- hide message about the obsolescence marker exchange behind a
+  `experimental.verbose-obsolescence-exchange` variable (default to False).
+
 4.0.1 -- 2014-08-08
 
 - createmarkers() accept an iterable (for compat with other extension)