# HG changeset patch # User Pierre-Yves David # Date 1506522390 -7200 # Node ID 945a0989e41bdb6aaa9dfc8b4de2d2a48bdb4dcf # Parent 081070828703ac44fadbb6d5556f600cac7efbf2# Parent d94a4e150633f58eaf66af7fd8d07aae34e4aae1 packaging: merge stable back into default 6.7.0 has been released. diff -r d94a4e150633 -r 945a0989e41b .hgtags --- 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 diff -r d94a4e150633 -r 945a0989e41b README --- 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 ------------------- diff -r d94a4e150633 -r 945a0989e41b debian/changelog --- 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 Wed, 27 Sep 2017 16:17:40 +0200 + mercurial-evolve (6.6.0-1) unstable; urgency=medium * new upstream release diff -r d94a4e150633 -r 945a0989e41b hgext3rd/evolve/metadata.py --- 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/' diff -r d94a4e150633 -r 945a0989e41b hgext3rd/topic/__init__.py --- 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/' diff -r d94a4e150633 -r 945a0989e41b tests/test-amend.t diff -r d94a4e150633 -r 945a0989e41b tests/test-discovery-obshashrange.t diff -r d94a4e150633 -r 945a0989e41b tests/test-divergent.t diff -r d94a4e150633 -r 945a0989e41b tests/test-drop.t diff -r d94a4e150633 -r 945a0989e41b tests/test-evolve-bumped.t diff -r d94a4e150633 -r 945a0989e41b tests/test-evolve-cycles.t diff -r d94a4e150633 -r 945a0989e41b tests/test-evolve-effectflags.t diff -r d94a4e150633 -r 945a0989e41b tests/test-evolve-list.t diff -r d94a4e150633 -r 945a0989e41b tests/test-evolve-obshistory-complex.t diff -r d94a4e150633 -r 945a0989e41b tests/test-evolve-obshistory.t diff -r d94a4e150633 -r 945a0989e41b tests/test-evolve-order.t diff -r d94a4e150633 -r 945a0989e41b tests/test-evolve-serveronly-bundle2.t diff -r d94a4e150633 -r 945a0989e41b tests/test-evolve-serveronly.t diff -r d94a4e150633 -r 945a0989e41b tests/test-evolve-split.t diff -r d94a4e150633 -r 945a0989e41b tests/test-evolve-templates.t diff -r d94a4e150633 -r 945a0989e41b tests/test-evolve-topic.t diff -r d94a4e150633 -r 945a0989e41b tests/test-evolve.t diff -r d94a4e150633 -r 945a0989e41b tests/test-exchange-obsmarkers-case-A3.t diff -r d94a4e150633 -r 945a0989e41b tests/test-exchange-obsmarkers-case-C1.t diff -r d94a4e150633 -r 945a0989e41b tests/test-inhibit.t diff -r d94a4e150633 -r 945a0989e41b tests/test-metaedit.t diff -r d94a4e150633 -r 945a0989e41b tests/test-obsconvert.t diff -r d94a4e150633 -r 945a0989e41b tests/test-obsolete-push.t diff -r d94a4e150633 -r 945a0989e41b tests/test-obsolete.t diff -r d94a4e150633 -r 945a0989e41b tests/test-prev-next.t diff -r d94a4e150633 -r 945a0989e41b tests/test-prune.t diff -r d94a4e150633 -r 945a0989e41b tests/test-sharing.t diff -r d94a4e150633 -r 945a0989e41b tests/test-split.t diff -r d94a4e150633 -r 945a0989e41b tests/test-stabilize-conflict.t diff -r d94a4e150633 -r 945a0989e41b tests/test-stabilize-order.t diff -r d94a4e150633 -r 945a0989e41b tests/test-stabilize-result.t diff -r d94a4e150633 -r 945a0989e41b tests/test-stack-branch.t diff -r d94a4e150633 -r 945a0989e41b tests/test-topic-push-concurrent-on.t diff -r d94a4e150633 -r 945a0989e41b tests/test-topic-push.t diff -r d94a4e150633 -r 945a0989e41b tests/test-topic-stack-data.t diff -r d94a4e150633 -r 945a0989e41b tests/test-topic-stack.t diff -r d94a4e150633 -r 945a0989e41b tests/test-topic-tutorial.t diff -r d94a4e150633 -r 945a0989e41b tests/test-topic.t diff -r d94a4e150633 -r 945a0989e41b tests/test-touch.t diff -r d94a4e150633 -r 945a0989e41b tests/test-tutorial.t diff -r d94a4e150633 -r 945a0989e41b tests/test-uncommit-interactive.t diff -r d94a4e150633 -r 945a0989e41b tests/test-uncommit.t diff -r d94a4e150633 -r 945a0989e41b tests/test-unstable.t diff -r d94a4e150633 -r 945a0989e41b tests/test-userguide.t diff -r d94a4e150633 -r 945a0989e41b tests/test-wireproto-bundle1.t diff -r d94a4e150633 -r 945a0989e41b tests/test-wireproto.t