merge 2.4 code back into default.
--- a/.hgtags Tue Oct 23 17:45:21 2012 +0200
+++ b/.hgtags Fri Oct 26 18:01:08 2012 +0200
@@ -12,3 +12,4 @@
ca5bb72d14aeb6e6053e3a53c064a2b7dc8010e5 1.0.1
b1bdcb4506defef0e857e2710633f7686d8034a5 1.0.2
5559e5a4b656978c592d364f242edc62369d7e84 1.0.2
+c062edbcaf13135d0312fd2039deca74573ff4f0 1.1.0
--- a/README Tue Oct 23 17:45:21 2012 +0200
+++ b/README Fri Oct 26 18:01:08 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
--- a/debian/control Tue Oct 23 17:45:21 2012 +0200
+++ b/debian/control Fri Oct 26 18:01:08 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.3~, <<2.4),
+ mercurial-common (>= 2.3~, <<2.4),
python,
debhelper (>= 8),
python-sphinx (>= 1.0.8),
@@ -22,7 +22,7 @@
Depends:
${python:Depends},
${misc:Depends},
- mercurial (>= 2.3~),
+ mercurial (>= 2.3~, <<2.4),
Description: evolve extension for Mercurial
This package provides the experimental "evolve" extension for the Mercurial
DVCS.