Patchwork [1,of,2] merge: remove dead assignment in applyupdates()

login
register
mail settings
Submitter Martin von Zweigbergk
Date Nov. 24, 2014, 6:43 p.m.
Message ID <d1a5b85dce66ff549e44.1416854600@martinvonz.mtv.corp.google.com>
Download mbox | patch
Permalink /patch/6838/
State Accepted
Headers show

Comments

Martin von Zweigbergk - Nov. 24, 2014, 6:43 p.m.
# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1416813034 28800
#      Sun Nov 23 23:10:34 2014 -0800
# Node ID d1a5b85dce66ff549e445408a8d3e43e7d1b832c
# Parent  a81c76106d9036060b3371f36b00ceefa5d60898
merge: remove dead assignment in applyupdates()

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -664,7 +664,6 @@ 
         repo.ui.debug(" %s: %s -> m\n" % (f, msg))
         z += 1
         progress(_updating, z, item=f, total=numupdates, unit=_files)
-        f1, f2, fa, move, anc = args
         if f == '.hgsubstate': # subrepo states need updating
             subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx),
                              overwrite)