diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py index 2754c82731326453a3cf20f43eb68eeae5e22123_bWVyY3VyaWFsL2NtZHV0aWwucHk=..3ee44b41b042bc6b4142285d5bd1eee6711ab075_bWVyY3VyaWFsL2NtZHV0aWwucHk= 100644 --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -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