Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
authorPierre-Yves David <pierre-yves.david@octobus.net>
Thu, 01 Jun 2017 03:35:45 +0200
changeset 2543 3e62042a6bb7
parent 2542 52543410a9c7 (current diff)
parent 2541 383efcb9ed0f (diff)
child 2552 006400e25e22
merge with stable
--- 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
 -------------------
 
--- 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
evolve