# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@logilab.fr>
# Date 1353492351 -3600
# Node ID 279403a125653b3f5aedcd00e607da2d81e87e36
# Parent  3e7ec61fbcdce2ba0ea1cd575537c1bfd6156c85# Parent  148bf61583f4972302696e07e44d4517b7b9f241
merge

diff -r 3e7ec61fbcdc -r 279403a12565 .hgtags
--- a/.hgtags	Wed Nov 07 17:22:41 2012 +0100
+++ b/.hgtags	Wed Nov 21 11:05:51 2012 +0100
@@ -13,4 +13,5 @@
 b1bdcb4506defef0e857e2710633f7686d8034a5 1.0.2
 5559e5a4b656978c592d364f242edc62369d7e84 1.0.2
 c062edbcaf13135d0312fd2039deca74573ff4f0 1.1.0
+22cacfce2a65ab965c6179ae862b148f4abc7d8a 1.1.0
 d43e80504e55db9ad4826e860e50530103a27b0f 2.0.0
diff -r 3e7ec61fbcdc -r 279403a12565 debian/changelog
--- a/debian/changelog	Wed Nov 07 17:22:41 2012 +0100
+++ b/debian/changelog	Wed Nov 21 11:05:51 2012 +0100
@@ -1,3 +1,9 @@
+mercurial-evolve (1.1.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Pierre-Yves David <pierre-yves.david@logilab.fr>  Tue, 20 Nov 2012 16:28:12 +0100
+
 mercurial-evolve (1.0.2-1) UNRELEASED; urgency=low
 
   * New upstream Release
diff -r 3e7ec61fbcdc -r 279403a12565 debian/control
diff -r 3e7ec61fbcdc -r 279403a12565 hgext/evolve.py
--- a/hgext/evolve.py	Wed Nov 07 17:22:41 2012 +0100
+++ b/hgext/evolve.py	Wed Nov 21 11:05:51 2012 +0100
@@ -1499,7 +1499,7 @@
     [('A', 'addremove', None,
      _('mark new/missing files as added/removed before committing')),
     ('n', 'note', '', _('use text as commit message for this update')),
-    ('c', 'change', '', _('specifies the changesets to amend'), _('REV')),
+    ('c', 'change', '', _('specifies the changesets to amend (DEPRECATED)'), _('REV')),
     ('e', 'edit', False, _('invoke editor on commit messages')),
     ] + walkopts + commitopts + commitopts2,
     _('[OPTION]... [FILE]...'))
diff -r 3e7ec61fbcdc -r 279403a12565 setup.py
--- a/setup.py	Wed Nov 07 17:22:41 2012 +0100
+++ b/setup.py	Wed Nov 21 11:05:51 2012 +0100
@@ -5,7 +5,7 @@
 
 setup(
     name='hg-evolve',
-    version='1.0.2',
+    version='1.1.0',
     author='Pierre-Yves David',
     maintainer='Pierre-Yves David',
     maintainer_email='pierre-yves.david@logilab.fr',