Mercurial > hg

diff 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
line wrap: on
line diff
--- a/mercurial/merge.py	Thu Jan 10 00:45:51 2013 +0100
+++ b/mercurial/merge.py	Thu Jan 10 03:40:45 2013 +0100
@@ -374,8 +374,6 @@
         f, m = a[:2]
         repo.ui.progress(_('updating'), i + 1, item=f, total=numupdates,
                          unit=_('files'))
-        if f and f[0] == "/":
-            continue
         if m == "r": # remove
             repo.ui.note(_("removing %s\n") % f)
             audit(f)