# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 1285015270 -7200
# Node ID cb59654c2c7a21e703a7ed85343b81c2319eb0d6
# Parent  e0ee3e822a9acb8d14602abdaa76740734977f2c
Restore lexists() changes lost in e0ee3e822a9a merge

diff -r e0ee3e822a9a -r cb59654c2c7a mercurial/cmdutil.py
--- a/mercurial/cmdutil.py	Mon Sep 20 22:29:13 2010 +0200
+++ b/mercurial/cmdutil.py	Mon Sep 20 22:41:10 2010 +0200
@@ -363,7 +363,7 @@
             islink, isexec = gp.mode
             dst = repo.wjoin(gp.path)
             # patch won't create empty files
-            if gp.op == 'ADD' and not os.path.exists(dst):
+            if gp.op == 'ADD' and not os.path.lexists(dst):
                 flags = (isexec and 'x' or '') + (islink and 'l' or '')
                 repo.wwrite(gp.path, '', flags)
             util.set_flags(dst, islink, isexec)
@@ -521,7 +521,7 @@
                     score = 0
                     for s in srcs:
                         t = os.path.join(dest, util.localpath(s[0])[striplen:])
-                        if os.path.exists(t):
+                        if os.path.lexists(t):
                             score += 1
                     return score