Mercurial > hg-stable

changeset 14406:c97c10a1b4bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
applyupdates: audit merged files protects changing flags on merged files (util.setflags call on line 341)
author Adrian Buehlmann <adrian@cadifra.com>
date Sun, 22 May 2011 11:03:15 +0200
parents f2295a829f47
children 51cabd567ac6
files mercurial/merge.py
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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