# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1156583940 -7200
# Node ID db3f42261452986ea709c56e7e70e8814b2828f6
# Parent  47aad3489da862c0588c9640e46e670b641a0c4f
fix errors reported by pychecker

mercurial/merge.py:174: No global (mode) found
mercurial/merge.py:253: No global (errno) found

diff -r 47aad3489da8 -r db3f42261452 mercurial/merge.py
--- a/mercurial/merge.py	Thu Aug 24 15:19:56 2006 -0700
+++ b/mercurial/merge.py	Sat Aug 26 11:19:00 2006 +0200
@@ -8,7 +8,7 @@
 from node import *
 from i18n import gettext as _
 from demandload import *
-demandload(globals(), "util os tempfile")
+demandload(globals(), "errno util os tempfile")
 
 def fmerge(f, local, other, ancestor):
     """merge executable flags"""
@@ -168,7 +168,8 @@
                     repo.ui.debug(_(" updating permissions for %s\n") % f)
                     util.set_exec(repo.wjoin(f), m2.execf(f))
                 else:
-                    if fmerge(f, m1, m2, ma) != m1.execf(f):
+                    mode = fmerge(f, m1, m2, ma)
+                    if mode != m1.execf(f):
                         repo.ui.debug(_(" updating permissions for %s\n")
                                       % f)
                         util.set_exec(repo.wjoin(f), mode)