Mercurial > hg-stable
changeset 14405:f2295a829f47
applyupdates: audit path on flag changes
we're using the auditor of the repo wopener, since this is a path that belongs
to the tree we're updating to
| author | Adrian Buehlmann <adrian@cadifra.com> |
|---|---|
| date | Sat, 21 May 2011 23:21:12 +0200 |
| parents | 69b60edfd76c |
| children | c97c10a1b4bc |
| 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:13:59 2011 +0200 +++ b/mercurial/merge.py Sat May 21 23:21:12 2011 +0200 @@ -373,6 +373,7 @@ repo.ui.warn(" %s\n" % nf) elif m == "e": # exec flags = a[2] + repo.wopener.audit(f) util.setflags(repo.wjoin(f), 'l' in flags, 'x' in flags) ms.commit() u.progress(_('updating'), None, total=numupdates, unit=_('files'))