# HG changeset patch
# User Dmitry Neverov <dmitry.neverov@jetbrains.com>
# Date 1375348666 -14400
# Node ID 7c04874db9e44c47dddb1fc4b3b92e28c66d6466
# Parent  0b723232d304d74f1d17778c0c0aa82a63fcdd2e# Parent  0d44c31bb36c42bfed604157a5fddbd84d7b22f1
Merge branch Gaya-8.0.x

diff -r 0b723232d304 -r 7c04874db9e4 mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/HgFileUtil.java
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/HgFileUtil.java	Thu Aug 01 12:51:42 2013 +0400
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/HgFileUtil.java	Thu Aug 01 13:17:46 2013 +0400
@@ -4,6 +4,7 @@
 import jetbrains.buildServer.util.FileUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import com.intellij.openapi.util.SystemInfo;
 
 import java.io.File;
 import java.io.FileFilter;
@@ -45,8 +46,16 @@
         //a file and there is a dir with a same name (http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6325169)
         if (dir.exists())
           continue;
-        if (!dir.createNewFile())
-          continue;
+        try {
+          if (!dir.createNewFile())
+            continue;
+        } catch (IOException e) {
+          //one more workaround for http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6325169
+          if (SystemInfo.isWindows && "Access is denied".equals(e.getMessage()) && dir.exists()) {
+            continue;
+          }
+          throw e;
+        }
         if (!dir.delete())
           continue;
         if (!dir.mkdir())