merge with stable

hgext/strip.py

@@ -119,6 +119,8 b' def stripcmd(ui, repo, *revs, **opts):'
     revs = list(revs) + opts.get('rev')
     revs = set(scmutil.revrange(repo, revs))
 
+    wlock = repo.wlock()
+    try:
     if opts.get('bookmark'):
         mark = opts.get('bookmark')
         marks = repo._bookmarks
@@ -193,7 +195,8 b' def stripcmd(ui, repo, *revs, **opts):'
             descendantrevs = repo.revs("%s::." % uctx.rev())
             changedfiles = []
             for rev in descendantrevs:
-                # blindly reset the files, regardless of what actually changed
+                    # blindly reset the files, regardless of what actually
+                    # changed
                 changedfiles.extend(repo[rev].files())
 
             # reset files that only changed in the dirstate too
@@ -214,6 +217,9 b' def stripcmd(ui, repo, *revs, **opts):'
         marks.write()
         ui.write(_("bookmark '%s' deleted\n") % mark)
 
-    strip(ui, repo, revs, backup=backup, update=update, force=opts.get('force'))
+        strip(ui, repo, revs, backup=backup, update=update,
+              force=opts.get('force'))
+    finally:
+        wlock.release()
 
     return 0