Mercurial > hg > evolve

changeset 861:b6337585ae25

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged 3.3 release into default Some of the default content was released in 3.3.0 the other ones are moved to 3.4
author Pierre-Yves David <pierre-yves.david@fb.com>
date Tue, 04 Mar 2014 11:31:11 -0800
parents 86b826399dfd (current diff) f3263e022ba8 (diff)
children f954e331d511
files README hgext/evolve.py
diffstat 3 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags
+++ b/.hgtags
@@ -19,3 +19,4 @@
 862b6b71a35836e81f090ba7229c2888e8ed2f9f 3.0.0
 cdb52bbbe5b8770d5e68943b7e73bee4ba136ecc 3.1.0
 c3ba8a965a7a173e388d84819e936ea9bae9797f 3.2.0
+83882f2fbecba0b7e7f7e5d490b57db93bd7fa22 3.3.0
--- a/README
+++ b/README
@@ -42,11 +42,12 @@
 Changelog
 =========
 
-3.3.0 --
+3.4.0 --
 
-- drop `latercomer` and `conflicting` compatibility. Those old alias are
-  deprecated for a long time now.
 - added Augie Facklers `fastop` extension (usage not recommended yet)
+
+3.3.0 -- 2014-03-04
+
 - 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
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@
 
 setup(
     name='hg-evolve',
-    version='3.2.0',
+    version='3.3.0',
     author='Pierre-Yves David',
     maintainer='Pierre-Yves David',
     maintainer_email='pierre-yves.david@logilab.fr',