changeset 3942:38c9a050ba03

branching: merge with stable

--- a/.hgtags	Fri Aug 03 01:16:51 2018 +0200
+++ b/.hgtags	Tue Aug 14 18:21:23 2018 +0200
@@ -67,3 +67,4 @@
 e4ac2e2c2086f977afa35e23a62f849e9305a225 7.3.0
 116cdd8c102ab0ae6295fb4886b0882e75e4d8f7 8.0.0
 0887c30255a1a1808d74a63b16e896d457f8ef32 8.0.1
+2c5d79c6459c6fabe0eb8723fc5041ac0dac7a9a 8.1.0

--- a/CHANGELOG	Fri Aug 03 01:16:51 2018 +0200
+++ b/CHANGELOG	Tue Aug 14 18:21:23 2018 +0200
@@ -4,20 +4,35 @@
 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
+  * compatibility with mercurial 4.7
+  * evolve: improve multiple aspect of content-divergence resolution
             * branch changes handling,
             * parent changes handling,
+            * description changes handling,
             * divergent stack handling,
-  * evolve: merge commit messages when resolving content divergence (issue5877)
+            * improved resume, stop and abort of divergent resolution
+  * evolve: improved automatic resolution of phase-divergence
+
+  * evolve: add a --update and --no-update flag to evolve to control final
+            working copy parent
+  * evolve: show `hg help evolve.interrupted-evolve` in error when conflicts
   * evolve: show unfinished state information in `hg status -v` (issue5886)
   * evolve: move bookmarks also when updating to successors (issue5923)
+  * evolve: improve orphan resolution when combined with divergence (issue5946)
   * 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
             merge conflit, `hg help evolve.interrupted`.
+  * obslog: --filternonlocal
+
+  * rewind: first limited version of `rewind` command to restore stack of commit to a
+            precusors state (check command help for detail and limitation)
+
+topic (0.10.0)
+
+  * display a hint when a topic becomes empty
 
 8.0.1 -- 2018-06-11
 -------------------

--- a/hgext3rd/evolve/metadata.py	Fri Aug 03 01:16:51 2018 +0200
+++ b/hgext3rd/evolve/metadata.py	Tue Aug 14 18:21:23 2018 +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__ = '8.1.0.dev'
-testedwith = '4.3.2 4.4.2 4.5.2 4.6.1'
+__version__ = '8.2.0.dev'
+testedwith = '4.3.2 4.4.2 4.5.2 4.6.2 4.7'
 minimumhgversion = '4.3'
 buglink = 'https://bz.mercurial-scm.org/'

--- a/hgext3rd/evolve/templatekw.py	Fri Aug 03 01:16:51 2018 +0200
+++ b/hgext3rd/evolve/templatekw.py	Tue Aug 14 18:21:23 2018 +0200
@@ -26,13 +26,15 @@
 ### template keywords
 # XXX it does not handle troubles well :-/
 
[e-mail]('obsolete')
-def obsoletekw(repo, ctx, templ, **args):
-    """String. Whether the changeset is ``obsolete``.
-    """
-    if ctx.obsolete():
-        return 'obsolete'
-    return ''
+if not util.safehasattr(templatekw, 'showobsolete'):
+    # hg < 4.2
+    @eh.templatekw('obsolete')
+    def obsoletekw(repo, ctx, templ, **args):
+        """String. Whether the changeset is ``obsolete``.
+        """
+        if ctx.obsolete():
+            return 'obsolete'
+        return ''
 
 if util.safehasattr(templatekw, 'compatlist'):
     @eh.templatekw('troubles', requires=set(['ctx', 'templ']))

--- a/hgext3rd/topic/__init__.py	Fri Aug 03 01:16:51 2018 +0200
+++ b/hgext3rd/topic/__init__.py	Tue Aug 14 18:21:23 2018 +0200
@@ -181,9 +181,9 @@
               'topic.active': 'green',
              }
 
-__version__ = '0.10.0.dev'
+__version__ = '0.11.0.dev'
 
-testedwith = '4.3.3 4.4.2 4.5.2 4.6.1'
+testedwith = '4.3.3 4.4.2 4.5.2 4.6.2 4.7'
 minimumhgversion = '4.3'
 buglink = 'https://bz.mercurial-scm.org/'