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 with stable
authorMatt Mackall <mpm@selenic.com>
Wed, 07 Apr 2010 14:44:51 -0500
changeset 10873 bbf496db0766
parent 10871 3f30190781a3 (current diff)
parent 10872 9606edb8777e (diff)
child 10879 29030b7f664a
Merge with stable
hgext/mq.py file | annotate | diff | comparison | revisions 
--- 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]
Mercurial