# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 1285105106 -7200
# Node ID 3ee44b41b042bc6b4142285d5bd1eee6711ab075
# Parent  2754c82731326453a3cf20f43eb68eeae5e22123# Parent  d0a97814b7d7f7eb6790d00813848dfc9ea82193
Merge with crew

diff -r 2754c8273132 -r 3ee44b41b042 mercurial/cmdutil.py
--- a/mercurial/cmdutil.py	Tue Sep 21 23:37:47 2010 +0200
+++ b/mercurial/cmdutil.py	Tue Sep 21 23:38:26 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