Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 14405:f2295a829f47

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 ae1f7a5373e8
children c97c10a1b4bc
comparison
equal deleted inserted replaced
14404:69b60edfd76c 14405:f2295a829f47
371 "multiple times to:\n") % f) 371 "multiple times to:\n") % f)
372 for nf in fl: 372 for nf in fl:
373 repo.ui.warn(" %s\n" % nf) 373 repo.ui.warn(" %s\n" % nf)
374 elif m == "e": # exec 374 elif m == "e": # exec
375 flags = a[2] 375 flags = a[2]
376 repo.wopener.audit(f)
376 util.setflags(repo.wjoin(f), 'l' in flags, 'x' in flags) 377 util.setflags(repo.wjoin(f), 'l' in flags, 'x' in flags)
377 ms.commit() 378 ms.commit()
378 u.progress(_('updating'), None, total=numupdates, unit=_('files')) 379 u.progress(_('updating'), None, total=numupdates, unit=_('files'))
379 380
380 return updated, merged, removed, unresolved 381 return updated, merged, removed, unresolved