# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1533160330 -7200
# Node ID 66a863bb640134d64641b055a7e3d13c97784b33
# Parent  2af10d0a59e06c7f84d33eb1eb5eec4a880df162# Parent  ca7f02c9fa57033c5c0fbe66542c9cfb73851638
branching: merge stable back into default

diff -r 2af10d0a59e0 -r 66a863bb6401 CHANGELOG
--- a/CHANGELOG	Tue Jul 31 11:25:57 2018 +0200
+++ b/CHANGELOG	Wed Aug 01 23:52:10 2018 +0200
@@ -4,15 +4,16 @@
 8.1.0 - in progress
 -------------------
 
+  * compatibility with mercurial 4.7rc0
   * evolve: handle branch changes when solving content divergence,
   * evolve: improve multiple aspect of divergence resolution
             * branch changes handling,
             * parent changes handling,
             * divergent stack handling,
-  * evolve: add a help section dedicated to interrupted evolve,
   * evolve: merge commit messages when resolving content divergence (issue5877)
   * evolve: show unfinished state information in `hg status -v` (issue5886)
   * evolve: move bookmarks also when updating to successors (issue5923)
+  * amend: abort `--patch` by saving an empty file (issue5925)
   * evolve: add a new `--no-update` flag to keep working copy on the initial
             revision.
   * evolve: new help section dedicated to resuming operation interrupted by
diff -r 2af10d0a59e0 -r 66a863bb6401 hgext3rd/evolve/stablerange.py
--- a/hgext3rd/evolve/stablerange.py	Tue Jul 31 11:25:57 2018 +0200
+++ b/hgext3rd/evolve/stablerange.py	Wed Aug 01 23:52:10 2018 +0200
@@ -157,29 +157,29 @@
     @abc.abstractmethod
     def subranges(self, repo, rangeid):
         """return the stable sub-ranges of a rangeid"""
-        raise NotImplemented()
+        raise NotImplementedError()
 
     @abc.abstractmethod
     def revsfromrange(self, repo, rangeid):
         """return revision contained in a range"""
-        raise NotImplemented()
+        raise NotImplementedError()
 
     @abc.abstractmethod
     def depthrev(self, repo, rev):
         """depth a revision"""
         # Exist to allow basic implementation to ignore the depthcache
         # Could be demoted to _depthrev.
-        raise NotImplemented()
+        raise NotImplementedError()
 
     @abc.abstractmethod
     def warmup(self, repo, upto=None):
         """warmup the stable range cache"""
-        raise NotImplemented()
+        raise NotImplementedError()
 
     @abc.abstractmethod
     def rangelength(self, repo, rangeid):
         """number of revision in <range>"""
-        raise NotImplemented()
+        raise NotImplementedError()
 
     def _slicepoint(self, repo, rangeid):
         """find the standard slicing point for a range"""
diff -r 2af10d0a59e0 -r 66a863bb6401 hgext3rd/topic/discovery.py
--- a/hgext3rd/topic/discovery.py	Tue Jul 31 11:25:57 2018 +0200
+++ b/hgext3rd/topic/discovery.py	Wed Aug 01 23:52:10 2018 +0200
@@ -16,7 +16,7 @@
 try:
     from mercurial import wireproto
     wireproto.branchmap
-except ImportError: # <= hg-4.5
+except (AttributeError, ImportError): # <= hg-4.5
     from mercurial import wireprotov1server as wireproto
 
 def _headssummary(orig, pushop, *args, **kwargs):