# HG changeset patch # User Gregory Szorc <gregory.szorc@gmail.com> # Date 2015-08-09 03:10:46 # Node ID fa91c49a9b9fc790a4eaabb042debbd683f9a62d # Parent 38c585c2f8cc507730ceb44ebb0c7e742910234d tagmerge: use absolute_import diff --git a/mercurial/tagmerge.py b/mercurial/tagmerge.py --- a/mercurial/tagmerge.py +++ b/mercurial/tagmerge.py @@ -71,11 +71,20 @@ # - put blocks whose nodes come all from p2 first # - write the tag blocks in the sorted order -import tags as tagsmod -import util -from node import nullid, hex -from i18n import _ +from __future__ import absolute_import + import operator + +from .i18n import _ +from .node import ( + hex, + nullid, +) +from .import ( + tags as tagsmod, + util, +) + hexnullid = hex(nullid) def readtagsformerge(ui, repo, lines, fn='', keeplinenums=False):