# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@logilab.fr>
# Date 1351267521 -7200
# Node ID d912a0c38182b5970fc8bc1805caf8c3bf87cac4
# Parent  5527e4fe4418189e9b65e3a36413d08cd3d42d1f# Parent  e0847647fa6a5e1f55acfa7775613fbcfe8362cc
merge back with stable

diff -r 5527e4fe4418 -r d912a0c38182 .hgtags
--- a/.hgtags	Tue Oct 23 17:45:21 2012 +0200
+++ b/.hgtags	Fri Oct 26 18:05:21 2012 +0200
@@ -12,3 +12,5 @@
 ca5bb72d14aeb6e6053e3a53c064a2b7dc8010e5 1.0.1
 b1bdcb4506defef0e857e2710633f7686d8034a5 1.0.2
 5559e5a4b656978c592d364f242edc62369d7e84 1.0.2
+c062edbcaf13135d0312fd2039deca74573ff4f0 1.1.0
+d43e80504e55db9ad4826e860e50530103a27b0f 2.0.0
diff -r 5527e4fe4418 -r d912a0c38182 README
--- a/README	Tue Oct 23 17:45:21 2012 +0200
+++ b/README	Fri Oct 26 18:05:21 2012 +0200
@@ -46,18 +46,18 @@
 Changelog
 ==================
 
- -- 2.0.0
+2.4.0 -- 2012-10-26
 
 - compat with mercurial 2.4
 
- -- 1.1.0
+1.1.0 -- 2012-10-26
 
 - fix troubles creation reporting from rebase
 - rename latecomer to bumped
 - renamed conflicting to divergent
 - smarter divergent handling
 
-1.0.2 --
+1.0.2 -- 2012-09-19
 
 - fix hg fold bug
 - fix hg pull --rebase
diff -r 5527e4fe4418 -r d912a0c38182 debian/control
--- a/debian/control	Tue Oct 23 17:45:21 2012 +0200
+++ b/debian/control	Fri Oct 26 18:05:21 2012 +0200
@@ -7,8 +7,8 @@
  Pierre-Yves David <pierre-yves.david@logilab.fr>,
 Standards-Version: 3.9.3
 Build-Depends:
- mercurial (>= 2.3~),
- mercurial-common (>= 2.3~),
+ mercurial (>=2.4~),
+ mercurial-common (>=2.4~),
  python,
  debhelper (>= 8),
  python-sphinx (>= 1.0.8),
@@ -22,7 +22,7 @@
 Depends:
  ${python:Depends},
  ${misc:Depends},
- mercurial (>= 2.3~),
+ mercurial (>= 2.4),
 Description: evolve extension for Mercurial
  This package provides the experimental "evolve" extension for the Mercurial
  DVCS.
diff -r 5527e4fe4418 -r d912a0c38182 hgext/evolve.py
--- a/hgext/evolve.py	Tue Oct 23 17:45:21 2012 +0200
+++ b/hgext/evolve.py	Fri Oct 26 18:05:21 2012 +0200
@@ -328,8 +328,7 @@
 ### Complete troubles computation logic                           ###
 #####################################################################
 
-# there is two kind of trouble not handled by core right now:
-# - bumped: (successors for public changeset)
+# there is one kind of trouble not handled by core right now:
 # - divergent: (two changeset try to succeed to the same precursors)
 #
 # This section add support for those two addition trouble