Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 23386:8229f32d2b79

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: remove dead assignment in applyupdates()
author Martin von Zweigbergk <martinvonz@google.com>
date Sun, 23 Nov 2014 23:10:34 -0800
parents 91c24457c16a
children 3eb99f8e9a62
comparison
equal deleted inserted replaced
23385:91c24457c16a 23386:8229f32d2b79
760 # merge 760 # merge
761 for f, args, msg in actions['m']: 761 for f, args, msg in actions['m']:
762 repo.ui.debug(" %s: %s -> m\n" % (f, msg)) 762 repo.ui.debug(" %s: %s -> m\n" % (f, msg))
763 z += 1 763 z += 1
764 progress(_updating, z, item=f, total=numupdates, unit=_files) 764 progress(_updating, z, item=f, total=numupdates, unit=_files)
765 f1, f2, fa, move, anc = args
766 if f == '.hgsubstate': # subrepo states need updating 765 if f == '.hgsubstate': # subrepo states need updating
767 subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx), 766 subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx),
768 overwrite) 767 overwrite)
769 continue 768 continue
770 audit(f) 769 audit(f)