# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1118303587 -3600
# Node ID 0dbcf3c9ff20a27a49eb5c369c3fb990d0bc0834
# Parent  38919e1c254dd1aaa3233e31fd92a4b7411cf3b1
Fixed usage of removed variable 'wp'.


diff --git a/mercurial/hg.py b/mercurial/hg.py
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -1000,7 +1000,7 @@ class localrepository:
             try:
                 self.wfile(f, "w").write(t)
             except IOError:
-                os.makedirs(os.path.dirname(wp))
+                os.makedirs(os.path.dirname(self.wjoin(f)))
                 self.wfile(f, "w").write(t)
             set_exec(self.wjoin(f), mf2[f])
             self.dirstate.update([f], mode)
@@ -1012,7 +1012,7 @@ class localrepository:
             self.ui.status("merging %s\n" % f)
             m, o, flag = merge[f]
             self.merge3(f, m, o)
-            set_exec(wp, flag)
+            set_exec(self.wjoin(f), flag)
             self.dirstate.update([f], 'm')
 
         for f in remove: