mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 08:18:15 +03:00
merge: remove dead assignment in applyupdates()
This commit is contained in:
parent
3e76cdec1c
commit
52b3a1afd7
@ -762,7 +762,6 @@ def applyupdates(repo, actions, wctx, mctx, overwrite, labels=None):
|
||||
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)
|
||||
|
Loading…
Reference in New Issue
Block a user