facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 07:49:11 +03:00
Code Issues Projects Releases Wiki Activity

Fixed usage of removed variable 'wp'.

Browse Source
This commit is contained in:
Thomas Arendsen Hein 2005-06-09 08:53:07 +01:00
parent 091e79d4cd
commit ed63b972a6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mercurial/hg.py
View File

@ -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: