Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 33096:873f638fd7db

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: change repo.wvfs.setflags calls to a new wctx[f].setflags function As with previous changes in this series, this should be a no-op.
author Phil Cohen <phillco@fb.com>
date Sun, 25 Jun 2017 22:29:09 -0700
parents 05c680ebf512
children 1e79c66d6b07
line wrap: on
line diff
--- a/mercurial/merge.py	Sun Jun 25 17:00:15 2017 -0700
+++ b/mercurial/merge.py	Sun Jun 25 22:29:09 2017 -0700
@@ -1291,7 +1291,7 @@
         progress(_updating, z, item=f, total=numupdates, unit=_files)
         flags, = args
         audit(f)
-        repo.wvfs.setflags(f, 'l' in flags, 'x' in flags)
+        wctx[f].setflags('l' in flags, 'x' in flags)
         updated += 1
 
     # the ordering is important here -- ms.mergedriver will raise if the merge