# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1496280945 -7200
# Node ID 3e62042a6bb76c01c71685e24b8900b8c502c598
# Parent  52543410a9c7bdd5b27e898c7d36fe6999039197# Parent  383efcb9ed0fa81c9573b82c8f2ee2eaab193bd8
merge with stable

diff -r 52543410a9c7 -r 3e62042a6bb7 README
--- a/README	Thu Jun 01 03:32:10 2017 +0200
+++ b/README	Thu Jun 01 03:35:45 2017 +0200
@@ -121,6 +121,11 @@
 Changelog
 =========
 
+6.3.1 - in progress
+-------------------
+
+ - also backport the "revelant-markers" fix when using "evolve.serveronly"
+
 6.3.0 -- 2017-05-31
 -------------------
 
diff -r 52543410a9c7 -r 3e62042a6bb7 hgext3rd/evolve/serveronly.py
--- a/hgext3rd/evolve/serveronly.py	Thu Jun 01 03:32:10 2017 +0200
+++ b/hgext3rd/evolve/serveronly.py	Thu Jun 01 03:35:45 2017 +0200
@@ -15,6 +15,7 @@
 
 try:
     from . import (
+        compat,
         exthelper,
         metadata,
         obscache,
@@ -26,6 +27,7 @@
     # extension imported using direct path
     sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
     from evolve import (
+        compat,
         exthelper,
         metadata,
         obscache,
@@ -38,6 +40,7 @@
 buglink = metadata.buglink
 
 eh = exthelper.exthelper()
+eh.merge(compat.eh)
 eh.merge(obscache.eh)
 eh.merge(obsexchange.eh)
 uisetup = eh.final_uisetup