# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1508532898 -7200
# Node ID 088ea9b74e47bb9ab498835e830d13a905146122
# Parent  50be10c63825dd0b590c4a8ec44b1860fe93b5fb# Parent  a1cdc128defd745588c0c747a9b49ce1d719ec34
test-compat: merge future 6.7.0 in mercurial-4.0 branch

diff --git a/CHANGELOG b/CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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 --git a/hgext3rd/evolve/obshistory.py b/hgext3rd/evolve/obshistory.py
--- a/hgext3rd/evolve/obshistory.py
+++ b/hgext3rd/evolve/obshistory.py
@@ -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 --git a/tests/test-drop.t b/tests/test-drop.t
diff --git a/tests/test-evolve-effectflags.t b/tests/test-evolve-effectflags.t
diff --git a/tests/test-evolve-obshistory.t b/tests/test-evolve-obshistory.t
diff --git a/tests/test-evolve-templates.t b/tests/test-evolve-templates.t
diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t
diff --git a/tests/test-stabilize-conflict.t b/tests/test-stabilize-conflict.t
diff --git a/tests/test-stabilize-order.t b/tests/test-stabilize-order.t
diff --git a/tests/test-topic-tutorial.t b/tests/test-topic-tutorial.t