--- a/hgext3rd/evolve/__init__.py Wed Mar 08 23:04:45 2017 +0100
+++ b/hgext3rd/evolve/__init__.py Tue Mar 07 14:19:12 2017 +0100
@@ -111,7 +111,7 @@
from mercurial.node import nullid
from . import (
- exchange,
+ obsexchange,
exthelper,
metadata,
serveronly,
@@ -148,7 +148,7 @@
eh = exthelper.exthelper()
-eh.merge(exchange.eh)
+eh.merge(obsexchange.eh)
uisetup = eh.final_uisetup
extsetup = eh.final_extsetup
reposetup = eh.final_reposetup
@@ -3093,7 +3093,7 @@
@eh.command(
'debugobsconvert',
- [('', 'new-format', exchange._bestformat, _('Destination format for markers.'))],
+ [('', 'new-format', obsexchange._bestformat, _('Destination format for markers.'))],
'')
def debugobsconvert(ui, repo, new_format):
origmarkers = repo.obsstore._all # settle version