# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1270669491 18000
# Node ID bbf496db07668450aa342186eebde13cebd86e4c
# Parent  3f30190781a38abc8a05aca3be3d8a9d8092700a# Parent  9606edb8777e2621311f37c9457eb2c717948b0d
Merge with stable

diff -r 3f30190781a3 -r bbf496db0766 hgext/mq.py
--- a/hgext/mq.py	Tue Apr 06 08:54:18 2010 -0500
+++ b/hgext/mq.py	Wed Apr 07 14:44:51 2010 -0500
@@ -1170,12 +1170,10 @@
                     raise util.Abort(_("deletions found between repo revs"))
                 for f in a:
                     try:
-                        os.unlink(repo.wjoin(f))
+                        util.unlink(repo.wjoin(f))
                     except OSError, e:
                         if e.errno != errno.ENOENT:
                             raise
-                    try: os.removedirs(os.path.dirname(repo.wjoin(f)))
-                    except: pass
                     repo.dirstate.forget(f)
                 for f in m + r:
                     fctx = ctx[f]