# HG changeset patch
# User Vadim Gelfer <vadim.gelfer@gmail.com>
# Date 1155409943 25200
# Node ID c9b08cacf983db8285778904cd780a4e178c7b57
# Parent  18cf5349a361edef4f6843f34ff31b2ae93239f3# Parent  7706fa50367754925e334c57240debe8cde95a7c
merge.

diff -r 18cf5349a361 -r c9b08cacf983 mercurial/commands.py
--- a/mercurial/commands.py	Sat Aug 12 08:53:23 2006 -0300
+++ b/mercurial/commands.py	Sat Aug 12 12:12:23 2006 -0700
@@ -1822,6 +1822,9 @@
                         'retrieving revision [0-9]+(\.[0-9]+)*$|' +
                         '(---|\*\*\*)[ \t])', re.MULTILINE)
 
+    wlock = repo.wlock()
+    lock = repo.lock()
+
     for patch in patches:
         pf = os.path.join(d, patch)
 
@@ -1910,8 +1913,8 @@
                 cwd = repo.getcwd()
                 if cwd:
                     cfiles = [util.pathto(cwd, f) for f in files]
-                addremove_lock(ui, repo, cfiles, {})
-            repo.commit(files, message, user, date)
+                addremove_lock(ui, repo, cfiles, {}, wlock=wlock)
+            repo.commit(files, message, user, date, wlock=wlock, lock=lock)
         finally:
             os.unlink(tmpname)