# HG changeset patch
# User Vadim Gelfer <vadim.gelfer@gmail.com>
# Date 1145417613 25200
# Node ID 19fcc2889bad2aba18a1d48e98f1c40b6f187851
# Parent  f71e9656524f1c88001c0e47404361523cfc999f# Parent  8742352db413097dc4022b41e98af82266ca73ee
merge with mainline.


diff --git a/hgext/mq.py b/hgext/mq.py
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -625,7 +625,10 @@ class queue:
             try:
                 repo.wfile(f, "w").write(t)
             except IOError:
-                os.makedirs(os.path.dirname(repo.wjoin(f)))
+                try:
+                    os.makedirs(os.path.dirname(repo.wjoin(f)))
+                except OSError, err:
+                    if err.errno != errno.EEXIST: raise
                 repo.wfile(f, "w").write(t)
 
         if not wlock: