# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1420513472 28800
# Node ID a556fff7adcff3a4f92f8d44abff8af403e00689
# Parent  0c879e986ce43f0802c6e684e45a4c937843e001# Parent  583f7f03434b14249c73b66412a0c12d4edabae9
merge with stable

diff -r 0c879e986ce4 -r a556fff7adcf .hgtags
--- a/.hgtags	Sun Dec 14 12:19:40 2014 -0800
+++ b/.hgtags	Mon Jan 05 19:04:32 2015 -0800
@@ -29,3 +29,4 @@
 51e1e962172c0178394cd36652d90181319f5416 5.0.1
 51e1e962172c0178394cd36652d90181319f5416 5.0.1
 0f30907852831f818bd0d01141b4ab7d8d71b821 5.0.1
+dbd0733e584073d6a7b6dea933767853e9cfe845 5.0.2
diff -r 0c879e986ce4 -r a556fff7adcf README
--- a/README	Sun Dec 14 12:19:40 2014 -0800
+++ b/README	Mon Jan 05 19:04:32 2015 -0800
@@ -51,7 +51,11 @@
 Changelog
 =========
 
-5.0.2 --
+5.0.3 --
+
+- evolve: don't abort Mercurial on version mismatch
+
+5.0.2 -- 2014-12-14
 
 - evolve: remove dependency to the rebase extension
 
diff -r 0c879e986ce4 -r a556fff7adcf debian/changelog
--- a/debian/changelog	Sun Dec 14 12:19:40 2014 -0800
+++ b/debian/changelog	Mon Jan 05 19:04:32 2015 -0800
@@ -1,3 +1,9 @@
+mercurial-evolve (5.0.2-1) unstable; urgency=medium
+
+  * new upstream release
+
+ -- Pierre-Yves David <pierre-yves.david@ens-lyon.org>  Sun, 14 Dec 2014 12:43:28 -0800
+
 mercurial-evolve (5.0.1-1) unstable; urgency=medium
 
   * New upstream release.
diff -r 0c879e986ce4 -r a556fff7adcf hgext/evolve.py
--- a/hgext/evolve.py	Sun Dec 14 12:19:40 2014 -0800
+++ b/hgext/evolve.py	Mon Jan 05 19:04:32 2015 -0800
@@ -19,7 +19,7 @@
     - improves some aspect of the early implementation in Mercurial core
 '''
 
-__version__ = '5.0.1'
+__version__ = '5.0.2'
 testedwith = '3.2'
 buglink = 'http://bz.selenic.com/'
 
@@ -85,8 +85,7 @@
     def memfilectx(repo, *args, **kwargs):
         return oldmemfilectx(*args, **kwargs)
 else:
-    raise util.Abort('Your Mercurial is too old for this version of Evolve\n'
-                     'requires version %s or above' % min(testedwith.split()))
+    raise ImportError('evolve needs version %s or above' % min(testedwith.split()))
 
 
 # This extension contains the following code