--- a/mercurial/commands.py Wed Oct 18 10:37:34 2006 -0700
+++ b/mercurial/commands.py Wed Oct 18 10:37:34 2006 -0700
@@ -1656,8 +1656,12 @@
message = None
ui.debug(_('message:\n%s\n') % message)
- files, fuzz = patch.patch(tmpname, ui, strip=strip, cwd=repo.root)
- files = patch.updatedir(ui, repo, files, wlock=wlock)
+ files = {}
+ try:
+ fuzz = patch.patch(tmpname, ui, strip=strip, cwd=repo.root,
+ files=files)
+ finally:
+ files = patch.updatedir(ui, repo, files, wlock=wlock)
repo.commit(files, message, user, date, wlock=wlock, lock=lock)
finally:
os.unlink(tmpname)