facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-09 16:31:02 +03:00
Code Issues Projects Releases Wiki Activity

merge: remove dead assignment in applyupdates()

Browse Source
This commit is contained in:
Martin von Zweigbergk 2014-11-23 23:10:34 -08:00
parent 3e76cdec1c
commit 52b3a1afd7
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mercurial/merge.py
View File

@ -762,7 +762,6 @@ def applyupdates(repo, actions, wctx, mctx, overwrite, labels=None):
repo.ui.debug(" %s: %s -> m\n" % (f, msg)) repo.ui.debug(" %s: %s -> m\n" % (f, msg))
z += 1 z += 1
progress(_updating, z, item=f, total=numupdates, unit=_files) progress(_updating, z, item=f, total=numupdates, unit=_files)
f1, f2, fa, move, anc = args
if f == '.hgsubstate': # subrepo states need updating if f == '.hgsubstate': # subrepo states need updating
subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx), subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx),
overwrite) overwrite)