Mercurial > hg-stable

changeset 25981:fa91c49a9b9f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tagmerge: use absolute_import
author Gregory Szorc <gregory.szorc@gmail.com>
date Sat, 08 Aug 2015 20:10:46 -0700
parents 38c585c2f8cc
children b2f3f185e458
files mercurial/tagmerge.py
diffstat 1 files changed, 13 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/tagmerge.py	Sat Aug 08 20:03:58 2015 -0700
+++ b/mercurial/tagmerge.py	Sat Aug 08 20:10:46 2015 -0700
@@ -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):