# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1508532848 -7200
# Node ID 3e2abd40da072609db62e870a3e9c5c477f720bf
# Parent  9c9c8c1eeb939dac3534f61bd960914c5523440d# Parent  9f900937c198fd115caabd32612005904292f553
test-compat: merge future 6.7.0 in mercurial-4.2 branch

diff -r 9c9c8c1eeb93 -r 3e2abd40da07 CHANGELOG
--- a/CHANGELOG	Fri Oct 20 18:34:22 2017 +0200
+++ b/CHANGELOG	Fri Oct 20 22:54:08 2017 +0200
@@ -4,17 +4,15 @@
 6.8.0 -- in progress
 ----------------
 
+  * compatibility with Mercurial 4.4
+    (use upstream implementation for obsfate and effect-flags starting hg 4.4+)
+  * pager: pager support to `obslog` and `evolve --list`
+
 topic(0.4.0)
 
   * topic: fix handling of bookmarks and phases while changing topics.
-
-6.7.2 -- in progress
-----------------
-
-  * pager: pager support to `obslog` and `evolve --list`
-
-topic(0.3.2)
-
+           (mercurial 4.2 and above only)
+  * topic: fix 'topic-mode' behavior when amending
   * pager: pager support to `topics` and `stack`
 
 6.7.1 -- 2017-10-10
diff -r 9c9c8c1eeb93 -r 3e2abd40da07 hgext3rd/evolve/obshistory.py
--- a/hgext3rd/evolve/obshistory.py	Fri Oct 20 18:34:22 2017 +0200
+++ b/hgext3rd/evolve/obshistory.py	Fri Oct 20 22:54:08 2017 +0200
@@ -815,13 +815,6 @@
             # Replace the old one
             obsutil.successorsetverb = old
 
-# XXX temporary disable operation to clarify tests changes
-if util.safehasattr(obsutil, 'markersoperations'):
-
-    @eh.wrapfunction(obsutil, 'markersoperations')
-    def markersoperations(orig, *args, **kwargs):
-        return []
-
 FORMATSSETSFUNCTIONS = [
     _successorsetdates,
     _successorsetusers,
diff -r 9c9c8c1eeb93 -r 3e2abd40da07 tests/test-drop.t
diff -r 9c9c8c1eeb93 -r 3e2abd40da07 tests/test-evolve-effectflags.t
diff -r 9c9c8c1eeb93 -r 3e2abd40da07 tests/test-evolve-obshistory.t
diff -r 9c9c8c1eeb93 -r 3e2abd40da07 tests/test-evolve-templates.t
diff -r 9c9c8c1eeb93 -r 3e2abd40da07 tests/test-obsolete.t
diff -r 9c9c8c1eeb93 -r 3e2abd40da07 tests/test-stabilize-conflict.t
diff -r 9c9c8c1eeb93 -r 3e2abd40da07 tests/test-stabilize-order.t
diff -r 9c9c8c1eeb93 -r 3e2abd40da07 tests/test-topic-tutorial.t