[PATCH 1 of 2] merge: remove dead assignment in applyupdates()
Martin von Zweigbergk
martinvonz at google.com
Mon Nov 24 18:43:20 UTC 2014
# HG changeset patch
# User Martin von Zweigbergk <martinvonz at google.com>
# Date 1416813034 28800
# Sun Nov 23 23:10:34 2014 -0800
# Node ID d1a5b85dce66ff549e445408a8d3e43e7d1b832c
# Parent a81c76106d9036060b3371f36b00ceefa5d60898
merge: remove dead assignment in applyupdates()
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)
More information about the Mercurial-devel
mailing list