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.
merge.
authorVadim Gelfer <vadim.gelfer@gmail.com>
Sat, 12 Aug 2006 12:12:23 -0700
changeset 2858 c9b08cacf983
parent 2857 18cf5349a361 (current diff)
parent 2854 7706fa503677 (diff)
child 2859 345bac2bc4ec
merge.
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- 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)
Mercurial