packaging: merge stable back into default
6.7.0 has been released.
--- a/.hgtags Wed Sep 27 00:00:22 2017 +0200
+++ b/.hgtags Wed Sep 27 16:26:30 2017 +0200
@@ -56,3 +56,4 @@
e60248f26f923f4460682252f7863ff86f7b86b0 6.4.0
734c0bc066cdc0121a20a9cb44c8cc30c653be94 6.5.0
cc3e09e033a3c632c9ac35badbf8b5d53f584049 6.6.0
+3a4f75c6619c7ef7d78ee0912efd6cb01d55b521 6.7.0
--- a/README Wed Sep 27 00:00:22 2017 +0200
+++ b/README Wed Sep 27 16:26:30 2017 +0200
@@ -121,25 +121,25 @@
Changelog
=========
-6.7.0 - in progress
+6.7.0 -- 2017-09-27
-------------------
+ * compatibility with change in future 4.4 at this release date,
* documentation: improvement to content, wording and graphs,
- * compatibility with change in future 4.4 at this release date,
+ * obslog: improved templatability,
* obslog/log: improve verb used to describe and evolution,
- * obslog: improved templatability
- * pstatus/pdiff: update to full command. They now appears in the help.
- * uncommit: add a --interactive option.
+ * pstatus/pdiff: update to full command. They now appears in the help,
+ * uncommit: add a --interactive option (4.3+ only).
- * stack: improve display of interleaved topic
- * stack: improve display of merge commit
- * topic: gain a --current flag
- * topic: add a new 'debugconvertbookmark' commands.
- It helps migrating from bookmark feature branch to topic feature branch.
- * topic: small clarification and cleanup on various output
- * push: add a --topic option to mirror --bookmark and --branch.
- * topic: be more informative about topic activation and deactivation
- * topic: --age flag also shows the user who last touched the topic
+ * push: add a --topic option to mirror --bookmark and --branch,
+ * stack: improve display of interleaved topic,
+ * stack: improve display of merge commit,
+ * topic: add a new 'debugconvertbookmark' commands (4.3+ only),
+ It helps migrating from bookmark feature branch to topic feature branch,
+ * topic: --age flag also shows the user who last touched the topic,
+ * topic: be more informative about topic activation and deactivation,
+ * topic: gain a --current flag,
+ * topic: small clarification and cleanup on various output.
6.6.0 -- 2017-07-25
-------------------
--- a/debian/changelog Wed Sep 27 00:00:22 2017 +0200
+++ b/debian/changelog Wed Sep 27 16:26:30 2017 +0200
@@ -1,3 +1,9 @@
+mercurial-evolve (6.7.0-1) UNRELEASED; urgency=medium
+
+ * new upstream release
+
+ -- Pierre-Yves David <pierre-yves.david@ens-lyon.org> Wed, 27 Sep 2017 16:17:40 +0200
+
mercurial-evolve (6.6.0-1) unstable; urgency=medium
* new upstream release
--- a/hgext3rd/evolve/metadata.py Wed Sep 27 00:00:22 2017 +0200
+++ b/hgext3rd/evolve/metadata.py Wed Sep 27 16:26:30 2017 +0200
@@ -5,7 +5,7 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
-__version__ = '6.7.0.dev'
-testedwith = '3.8.4 3.9.2 4.0.2 4.1.3 4.2.2'
+__version__ = '6.7.1.dev'
+testedwith = '3.8.4 3.9.2 4.0.2 4.1.3 4.2.3 4.3.2'
minimumhgversion = '3.8'
buglink = 'https://bz.mercurial-scm.org/'
--- a/hgext3rd/topic/__init__.py Wed Sep 27 00:00:22 2017 +0200
+++ b/hgext3rd/topic/__init__.py Wed Sep 27 16:26:30 2017 +0200
@@ -122,8 +122,8 @@
'topic.active': 'green',
}
-__version__ = '0.3.0.dev'
-testedwith = '4.0.2 4.1.3 4.2.1'
+__version__ = '0.3.1.dev'
+testedwith = '4.0.2 4.1.3 4.2.3 4.3.3'
minimumhgversion = '4.0'
buglink = 'https://bz.mercurial-scm.org/'