# HG changeset patch
# User Adrian Buehlmann <adrian@cadifra.com>
# Date 1306054995 -7200
# Node ID c97c10a1b4bc615de043de27fc13582d36550862
# Parent  f2295a829f4751c34e6336334a4087c9aefa7590
applyupdates: audit merged files

protects changing flags on merged files (util.setflags call on line 341)

diff -r f2295a829f47 -r c97c10a1b4bc mercurial/merge.py
--- a/mercurial/merge.py	Sat May 21 23:21:12 2011 +0200
+++ b/mercurial/merge.py	Sun May 22 11:03:15 2011 +0200
@@ -329,6 +329,7 @@
                 subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx), overwrite)
                 continue
             f2, fd, flags, move = a[2:]
+            repo.wopener.audit(fd)
             r = ms.resolve(fd, wctx, mctx)
             if r is not None and r > 0:
                 unresolved += 1