# HG changeset patch
# User Phil Cohen <phillco@fb.com>
# Date 2017-05-12 01:38:43
# Node ID 7e79373263abcd8c60bb7ba106319d1c8fa7ff4a
# Parent  3a755652ce3afab761af1804d0665a45c350b01f

merge: use repo.wvfs.setflags() instead of util.setflags()

Most merge.py code goes through the vfs instead of maniulating
files directly, so let's do the same here.

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -1288,7 +1288,7 @@ def applyupdates(repo, actions, wctx, mc
         progress(_updating, z, item=f, total=numupdates, unit=_files)
         flags, = args
         audit(f)
-        util.setflags(repo.wjoin(f), 'l' in flags, 'x' in flags)
+        repo.wvfs.setflags(f, 'l' in flags, 'x' in flags)
         updated += 1
 
     # the ordering is important here -- ms.mergedriver will raise if the merge