Skip to content
Snippets Groups Projects
Commit c97c10a1 authored by Adrian Buehlmann's avatar Adrian Buehlmann
Browse files

applyupdates: audit merged files

protects changing flags on merged files (util.setflags call on line 341)
parent f2295a82
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment