Mercurial > evolve
changeset 601:e7b533be69f2 stable
merge with 1.1.0
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Fri, 26 Oct 2012 18:00:18 +0200 |
parents | d14f9c4ceaa7 (current diff) cd29c8c8b0a1 (diff) |
children | 7c40faf180bd |
files | |
diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Oct 26 17:38:51 2012 +0200 +++ b/.hgtags Fri Oct 26 18:00:18 2012 +0200 @@ -12,3 +12,4 @@ ca5bb72d14aeb6e6053e3a53c064a2b7dc8010e5 1.0.1 b1bdcb4506defef0e857e2710633f7686d8034a5 1.0.2 5559e5a4b656978c592d364f242edc62369d7e84 1.0.2 +c062edbcaf13135d0312fd2039deca74573ff4f0 1.1.0
--- a/debian/control Fri Oct 26 17:38:51 2012 +0200 +++ b/debian/control Fri Oct 26 18:00:18 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.