# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1191349535 -7200
# Node ID efe7ef325737f037b5e7f3fdc77cc502b565f25e
# Parent  9189ae05467d36217f85970b585177bb5bcdc23b# Parent  1df76921aab32ee607c9daeb30fb2769f575162d
merge with -stable

diff --git a/mercurial/util.py b/mercurial/util.py
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -1095,7 +1095,7 @@ else:
 
     def set_exec(f, mode):
         s = os.lstat(f).st_mode
-        if (s & 0100 != 0) == mode:
+        if stat.S_ISLNK(s) or (s & 0100 != 0) == mode:
             return
         if mode:
             # Turn on +x for every +r bit when making a file executable