Mercurial > hg > mercurial-crew-with-dirclash
changeset 297:0dbcf3c9ff20
Fixed usage of removed variable 'wp'.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 09 Jun 2005 08:53:07 +0100 |
parents | 38919e1c254d |
children | 91c9fd6a7c70 |
files | mercurial/hg.py |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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: