# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1509580031 -3600
# Node ID ade7a21ab324312d8af9684abc2074bba313bb7a
# Parent  90515d0bfb08eef1db5d7c10749b92e1c8717c6a# Parent  6ca44f334d47beb93587d47e0d90ae64335d19bf
branching: merge back stable back into default

diff -r 90515d0bfb08 -r ade7a21ab324 .hgtags
--- a/.hgtags	Wed Nov 01 16:23:13 2017 +0100
+++ b/.hgtags	Thu Nov 02 00:47:11 2017 +0100
@@ -59,3 +59,4 @@
 3a4f75c6619c7ef7d78ee0912efd6cb01d55b521 6.7.0
 430ad68292d76b9387d1eeadf289951f51fd88d3 6.7.1
 ec0bbf26ce7fadd42c637e01d3750dac96ac0b1b 6.8.0
+c56c028f3802202241551e5953bea74ab3a6c434 7.0.0
diff -r 90515d0bfb08 -r ade7a21ab324 CHANGELOG
--- a/CHANGELOG	Wed Nov 01 16:23:13 2017 +0100
+++ b/CHANGELOG	Thu Nov 02 00:47:11 2017 +0100
@@ -1,22 +1,22 @@
 Changelog
 =========
 
-7.0.0 - in progress
+7.0.0 -- 2017-10-23
 -------------------
 
   * drop compatibility with Mercurial 3.8, 3.9 and 4.0,
   * drop support for old and deprecated method to exchange obsmarkers,
   * forbid usage of the old pushbey based protocol to exchange obsmarkers,
-  * evolve: rename '--contentdivergent' flag to '--content-divergent'
-  * evolve: rename '--phasedivergent' flag to '--phase-divergent'
+  * evolve: rename '--contentdivergent' flag to '--content-divergent',
+  * evolve: rename '--phasedivergent' flag to '--phase-divergent'.
 
-topic
+topic (0.5.0)
 
   * add an experimental flag to enforce one head per name policy,
     (off by default, see 'hg help -e topic' for details)
   * add an experimental flag to have changesets without topic published on push,
     (off by default, see 'hg help -e topic' for details)
-  * add a '--publish' flag to `hg push` (4.4+ only),
+  * add a '--publish' flag to `hg push` (4.4+ only).
 
 6.8.0 -- 2017-10-23
 -------------------
diff -r 90515d0bfb08 -r ade7a21ab324 debian/changelog
--- a/debian/changelog	Wed Nov 01 16:23:13 2017 +0100
+++ b/debian/changelog	Thu Nov 02 00:47:11 2017 +0100
@@ -1,4 +1,10 @@
-mercurial-evolve (6.8.0-1) UNRELEASED; urgency=medium
+mercurial-evolve (7.0.0-1) unstable; urgency=medium
+
+  * new upstream release
+
+ -- Pierre-Yves David <pierre-yves.david@ens-lyon.org>  Thu, 02 Nov 2017 00:30:29 +0100
+
+mercurial-evolve (6.8.0-1) unstable; urgency=medium
 
   * new upstream release
 
diff -r 90515d0bfb08 -r ade7a21ab324 debian/control
--- a/debian/control	Wed Nov 01 16:23:13 2017 +0100
+++ b/debian/control	Thu Nov 02 00:47:11 2017 +0100
@@ -7,7 +7,7 @@
  Pierre-Yves David <pierre-yves.david@logilab.fr>,
 Standards-Version: 3.9.3
 Build-Depends:
- mercurial (>= 3.4~),
+ mercurial (>= 4.1),
  python,
  debhelper (>= 8),
  python-sphinx (>= 1.0.8),
@@ -22,19 +22,12 @@
 Depends:
  ${python:Depends},
  ${misc:Depends},
- mercurial (>= 3.3~),
+ mercurial (>= 4.1),
 Description: evolve extension for Mercurial
  This package provides the experimental "evolve" extension for the Mercurial
  DVCS.
  .
  This extension provides several commands to mutate history and deal with issues
  it may raise.
- .
- It also:
-  - enables the "Changeset Obsolescence" feature of mercurial,
-  - alters core command and extension that rewrite history to use this feature,
-  - improves some aspects of the early implementation in Mercurial 2.3.
- .
- **These extensions are experimental and are not meant for production.**
 
 
diff -r 90515d0bfb08 -r ade7a21ab324 hgext3rd/evolve/metadata.py
--- a/hgext3rd/evolve/metadata.py	Wed Nov 01 16:23:13 2017 +0100
+++ b/hgext3rd/evolve/metadata.py	Thu Nov 02 00:47:11 2017 +0100
@@ -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__ = '7.0.0.dev'
+__version__ = '7.0.1.dev'
 testedwith = '4.1.3 4.2.3 4.3.2 4.4'
 minimumhgversion = '4.1'
 buglink = 'https://bz.mercurial-scm.org/'
diff -r 90515d0bfb08 -r ade7a21ab324 hgext3rd/topic/__init__.py
--- a/hgext3rd/topic/__init__.py	Wed Nov 01 16:23:13 2017 +0100
+++ b/hgext3rd/topic/__init__.py	Thu Nov 02 00:47:11 2017 +0100
@@ -174,7 +174,7 @@
               'topic.active': 'green',
              }
 
-__version__ = '0.5.0.dev'
+__version__ = '0.5.1.dev'
 
 testedwith = '4.1.3 4.2.3 4.3.3 4.4'
 minimumhgversion = '4.1'