# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 1357785645 -3600
# Node ID 77973b6a7b0bea1a236c43e957c432542c86034c
# Parent  435909bf0257defb59644126587212410a52a31d
merge: remove old pre-audit code checking for absolute paths

Audit will handle this in a more elegant way.

diff -r 435909bf0257 -r 77973b6a7b0b mercurial/merge.py
--- 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)
diff -r 435909bf0257 -r 77973b6a7b0b tests/test-audit-path.t
--- a/tests/test-audit-path.t	Thu Jan 10 00:45:51 2013 +0100
+++ b/tests/test-audit-path.t	Thu Jan 10 03:40:45 2013 +0100
@@ -86,7 +86,7 @@
   $ hg manifest -r4
   /tmp/test
   $ hg update -Cr4
-  abort: *: '$TESTTMP/target//tmp/test' (glob)
+  abort: path contains illegal component: /tmp/test
   [255]
 
   $ cd ..