# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1359806527 -3600
# Node ID c5a5e9f2c959176a1cde9210e41fef1b2656d6e4
# Parent  e6e47c432ffd7cfbec22bdd57925e82a84d2ce08# Parent  ae99c0f06fcbf7297c33e873956fd8c556421a69
merge with stable

diff -r e6e47c432ffd -r c5a5e9f2c959 .hgtags
--- a/.hgtags	Fri Jan 25 17:26:47 2013 +0100
+++ b/.hgtags	Sat Feb 02 13:02:07 2013 +0100
@@ -16,3 +16,4 @@
 22cacfce2a65ab965c6179ae862b148f4abc7d8a 1.1.0
 d43e80504e55db9ad4826e860e50530103a27b0f 2.0.0
 f9d305deeff3dba782e65faf4ef3fd1569995859 2.1.0
+862b6b71a35836e81f090ba7229c2888e8ed2f9f 3.0.0
diff -r e6e47c432ffd -r c5a5e9f2c959 README
--- a/README	Fri Jan 25 17:26:47 2013 +0100
+++ b/README	Sat Feb 02 13:02:07 2013 +0100
@@ -11,9 +11,7 @@
 It also:
 
     - enables the "Changeset Obsolescence" feature of mercurial,
-    - alters core commands and extensions that rewrite history to use
-      this feature,
-    - improves some aspect of the early implementation in 2.3
+    - issues several warning messages when troubles appear in your repository.
 
 **These extensions are experimental and are not meant for production.**
 
@@ -46,6 +44,10 @@
 Changelog
 ==================
 
+3.0.0 -- 2013-02-02
+
+- compatibility with 2.5
+
 2.2.0 --
 
 - make evolve smarter at picking next troubled to solved without --any
diff -r e6e47c432ffd -r c5a5e9f2c959 docs/evolve-faq.rst
--- a/docs/evolve-faq.rst	Fri Jan 25 17:26:47 2013 +0100
+++ b/docs/evolve-faq.rst	Sat Feb 02 13:02:07 2013 +0100
@@ -133,7 +133,7 @@
 
 For more complexe scenario we recommend the use of the histedit_ extension.
 
-.. _histedit:: http://mercurial.selenic.com/wiki/HisteditExtension
+.. _histedit: http://mercurial.selenic.com/wiki/HisteditExtension
 
 
 Update my current work in progress after a pull
diff -r e6e47c432ffd -r c5a5e9f2c959 hgext/evolve.py
--- a/hgext/evolve.py	Fri Jan 25 17:26:47 2013 +0100
+++ b/hgext/evolve.py	Sat Feb 02 13:02:07 2013 +0100
@@ -19,7 +19,7 @@
     - improves some aspect of the early implementation in 2.3
 '''
 
-testedwith = ''
+testedwith = '2.5'
 buglink = 'https://bitbucket.org/marmoute/mutable-history/issues'
 
 
diff -r e6e47c432ffd -r c5a5e9f2c959 setup.py
--- a/setup.py	Fri Jan 25 17:26:47 2013 +0100
+++ b/setup.py	Sat Feb 02 13:02:07 2013 +0100
@@ -5,7 +5,7 @@
 
 setup(
     name='hg-evolve',
-    version='2.99.0',
+    version='3.0.0',
     author='Pierre-Yves David',
     maintainer='Pierre-Yves David',
     maintainer_email='pierre-yves.david@logilab.fr',