Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 18336:77973b6a7b0b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: remove old pre-audit code checking for absolute paths Audit will handle this in a more elegant way.
author Mads Kiilerich <mads@kiilerich.com>
date Thu, 10 Jan 2013 03:40:45 +0100
parents 435909bf0257
children 384df4db6520
comparison
equal deleted inserted replaced
18335:435909bf0257 18336:77973b6a7b0b
372 numupdates = len(actions) 372 numupdates = len(actions)
373 for i, a in enumerate(actions): 373 for i, a in enumerate(actions):
374 f, m = a[:2] 374 f, m = a[:2]
375 repo.ui.progress(_('updating'), i + 1, item=f, total=numupdates, 375 repo.ui.progress(_('updating'), i + 1, item=f, total=numupdates,
376 unit=_('files')) 376 unit=_('files'))
377 if f and f[0] == "/":
378 continue
379 if m == "r": # remove 377 if m == "r": # remove
380 repo.ui.note(_("removing %s\n") % f) 378 repo.ui.note(_("removing %s\n") % f)
381 audit(f) 379 audit(f)
382 if f == '.hgsubstate': # subrepo states need updating 380 if f == '.hgsubstate': # subrepo states need updating
383 subrepo.submerge(repo, wctx, mctx, wctx, overwrite) 381 subrepo.submerge(repo, wctx, mctx, wctx, overwrite)