Patchwork cmdutil: drop redundant import of merge module

login
register
mail settings
Submitter Yuya Nishihara
Date March 18, 2018, 4:39 a.m.
Message ID <a81427a2726fb71ae6cf.1521347960@mimosa>
Download mbox | patch
Permalink /patch/29592/
State Accepted
Headers show

Comments

Yuya Nishihara - March 18, 2018, 4:39 a.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1521345243 -32400
#      Sun Mar 18 12:54:03 2018 +0900
# Node ID a81427a2726fb71ae6cfbb5501734f69b7866aea
# Parent  395f0824cb28c050ab650011c95a514c750f6400
cmdutil: drop redundant import of merge module
Pulkit Goyal - March 18, 2018, 7:18 a.m.
On Sun, Mar 18, 2018 at 10:09 AM, Yuya Nishihara <yuya@tcha.org> wrote:
> # HG changeset patch
> # User Yuya Nishihara <yuya@tcha.org>
> # Date 1521345243 -32400
> #      Sun Mar 18 12:54:03 2018 +0900
> # Node ID a81427a2726fb71ae6cfbb5501734f69b7866aea
> # Parent  395f0824cb28c050ab650011c95a514c750f6400
> cmdutil: drop redundant import of merge module

Queued this. Many thanks!

Patch

diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -2358,8 +2358,6 @@  def amend(ui, repo, old, extra, pats, op
             if subs:
                 subrepoutil.writestate(repo, newsubstate)
 
-        # avoid cycle (TODO: should be removed in default branch)
-        from . import merge as mergemod
         ms = mergemod.mergestate.read(repo)
         mergeutil.checkunresolved(ms)