From patchwork Tue Nov 22 03:05:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [09, of, 10, layering] localrepo: refer to checkunresolved by its new name From: Augie Fackler X-Patchwork-Id: 17684 Message-Id: <6302626248347074dea4.1479783924@imladris.local> To: mercurial-devel@mercurial-scm.org Date: Mon, 21 Nov 2016 22:05:24 -0500 # HG changeset patch # User Augie Fackler # Date 1479781975 18000 # Mon Nov 21 21:32:55 2016 -0500 # Node ID 6302626248347074dea4080bbd22ccb26342cf40 # Parent e289afbde6a86a818330fbf76802d31da158ec9b localrepo: refer to checkunresolved by its new name diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -28,7 +28,6 @@ from . import ( bundle2, changegroup, changelog, - cmdutil, context, dirstate, dirstateguard, @@ -42,6 +41,7 @@ from . import ( manifest, match as matchmod, merge as mergemod, + mergeutil, namespaces, obsolete, pathutil, @@ -1630,7 +1630,7 @@ class localrepository(object): raise error.Abort(_("cannot commit merge with missing files")) ms = mergemod.mergestate.read(self) - cmdutil.checkunresolved(ms) + mergeutil.checkunresolved(ms) if editor: cctx._text = editor(self, cctx, subs)