Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed usage of removed variable 'wp'.
authorThomas Arendsen Hein <thomas@intevation.de>
Thu, 09 Jun 2005 08:53:07 +0100
changeset 297 0dbcf3c9ff20
parent 295 38919e1c254d
child 298 91c9fd6a7c70
Fixed usage of removed variable 'wp'.
mercurial/hg.py file | annotate | diff | comparison | revisions 
--- a/mercurial/hg.py	Wed Jun 08 22:03:18 2005 -0800
+++ b/mercurial/hg.py	Thu Jun 09 08:53:07 2005 +0100
@@ -1000,7 +1000,7 @@
             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 @@
             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:
Mercurial