# NetBeans IDE HG Patch
# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: /home/ondra/storage/netbeans/core-main
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: libs.svnClientAdapter.javahl/external/binaries-list
--- libs.svnClientAdapter.javahl/external/binaries-list
+++ libs.svnClientAdapter.javahl/external/binaries-list
@@ -1,2 +1,2 @@
-D08E473A4D0510FB329D64E4CC4F2963D000699C svnClientAdapter-javahl-1.10.3.jar
-24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2 svnjavahl-1.8.4.jar
+A0B50778562564256D1212206774924C346B8EFD svnClientAdapter-javahl-1.11.3.jar
+90F6B5D1DB94BC748CB265DDB832E189C615D009 svnjavahl-1.9.2.jar
Index: libs.svnClientAdapter.javahl/nbproject/project.properties
--- libs.svnClientAdapter.javahl/nbproject/project.properties
+++ libs.svnClientAdapter.javahl/nbproject/project.properties
@@ -43,8 +43,8 @@
 
 is.eager=true
 javac.source=1.6
-release.external/svnClientAdapter-javahl-1.10.3.jar=modules/ext/svnClientAdapter-javahl.jar
-release.external/svnjavahl-1.8.4.jar=modules/ext/svnjavahl.jar
+release.external/svnClientAdapter-javahl-1.11.3.jar=modules/ext/svnClientAdapter-javahl.jar
+release.external/svnjavahl-1.9.2.jar=modules/ext/svnjavahl.jar
 
 # Hidden class found: org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments in method protected byte[] org.tigris.subversion.svnclientadapter.commandline.SvnCommandLine.execBytes(org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments,boolean) throws java.lang.Exception in class org.tigris.subversion.svnclientadapter.commandline.SvnCommandLine
 # Hidden class found: org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments in method protected java.lang.String org.tigris.subversion.svnclientadapter.commandline.SvnAdminCommandLine.execString(org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments,boolean) throws java.lang.Exception in class org.tigris.subversion.svnclientadapter.commandline.SvnAdminCommandLine
Index: libs.svnClientAdapter.javahl/nbproject/project.xml
--- libs.svnClientAdapter.javahl/nbproject/project.xml
+++ libs.svnClientAdapter.javahl/nbproject/project.xml
@@ -104,11 +104,11 @@
             <public-packages/>
             <class-path-extension>
                 <runtime-relative-path>ext/svnClientAdapter-javahl.jar</runtime-relative-path>
-                <binary-origin>external/svnClientAdapter-javahl-1.10.3.jar</binary-origin>
+                <binary-origin>external/svnClientAdapter-javahl-1.11.3.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/svnjavahl.jar</runtime-relative-path>
-                <binary-origin>external/svnjavahl-1.8.4.jar</binary-origin>
+                <binary-origin>external/svnjavahl-1.9.2.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>
Index: libs.svnClientAdapter.svnkit/external/binaries-list
--- libs.svnClientAdapter.svnkit/external/binaries-list
+++ libs.svnClientAdapter.svnkit/external/binaries-list
@@ -1,4 +1,5 @@
 5D37A7FE167A1D44731192748C79B2D7905D474F svnClientAdapter-svnkit-1.10.3.jar
+39CC9E12AD77EBE0E991A547547F3D9FA91299DA svnClientAdapter-svnkit-1.11.3.jar
 8307A44D3F150F1BB317532097A0C7D125C00F2D org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar
 EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA sqljet-1.1.10.jar
 ACAB7C860DF78C4A528FD8A64F2C62A0A96639E5 com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar
Index: libs.svnClientAdapter.svnkit/nbproject/project.properties
--- libs.svnClientAdapter.svnkit/nbproject/project.properties
+++ libs.svnClientAdapter.svnkit/nbproject/project.properties
@@ -43,7 +43,7 @@
 
 is.eager=true
 javac.source=1.6
-release.external/svnClientAdapter-svnkit-1.10.3.jar=modules/ext/svnClientAdapter-svnkit.jar
+release.external/svnClientAdapter-svnkit-1.11.3.jar=modules/ext/svnClientAdapter-svnkit.jar
 release.external/org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar=modules/ext/svnkit.jar
 release.external/sqljet-1.1.10.jar=modules/ext/sqljet.jar
 release.external/com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar=modules/ext/trilead.ssh2.jar
Index: libs.svnClientAdapter.svnkit/nbproject/project.xml
--- libs.svnClientAdapter.svnkit/nbproject/project.xml
+++ libs.svnClientAdapter.svnkit/nbproject/project.xml
@@ -97,7 +97,7 @@
             <public-packages/>
             <class-path-extension>
                 <runtime-relative-path>ext/svnClientAdapter-svnkit.jar</runtime-relative-path>
-                <binary-origin>external/svnClientAdapter-svnkit-1.10.3.jar</binary-origin>
+                <binary-origin>external/svnClientAdapter-svnkit-1.11.3.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/svnkit.jar</runtime-relative-path>
Index: libs.svnClientAdapter/external/binaries-list
--- libs.svnClientAdapter/external/binaries-list
+++ libs.svnClientAdapter/external/binaries-list
@@ -1 +1 @@
-2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D svnClientAdapter-main-1.10.3.jar
\ No newline at end of file
+2D7BC3E7B4F459C612AD41ABCC7645D1D3F39BA2 svnClientAdapter-main-1.11.3.jar
\ No newline at end of file
Index: libs.svnClientAdapter/nbproject/project.properties
--- libs.svnClientAdapter/nbproject/project.properties
+++ libs.svnClientAdapter/nbproject/project.properties
@@ -43,7 +43,7 @@
 is.autoload=true
 
 javac.source=1.6
-release.external/svnClientAdapter-main-1.10.3.jar=modules/ext/svnClientAdapter-main.jar
+release.external/svnClientAdapter-main-1.11.3.jar=modules/ext/svnClientAdapter-main.jar
 
 # Hidden class found: org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments in method protected byte[] org.tigris.subversion.svnclientadapter.commandline.SvnCommandLine.execBytes(org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments,boolean) throws java.lang.Exception in class org.tigris.subversion.svnclientadapter.commandline.SvnCommandLine
 # Hidden class found: org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments in method protected java.lang.String org.tigris.subversion.svnclientadapter.commandline.SvnAdminCommandLine.execString(org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments,boolean) throws java.lang.Exception in class org.tigris.subversion.svnclientadapter.commandline.SvnAdminCommandLine
Index: libs.svnClientAdapter/nbproject/project.xml
--- libs.svnClientAdapter/nbproject/project.xml
+++ libs.svnClientAdapter/nbproject/project.xml
@@ -92,7 +92,7 @@
             </friend-packages>
             <class-path-extension>
                 <runtime-relative-path>ext/svnClientAdapter-main.jar</runtime-relative-path>
-                <binary-origin>external/svnClientAdapter-main-1.10.3.jar</binary-origin>
+                <binary-origin>external/svnClientAdapter-main-1.11.3.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>
Index: subversion/src/org/netbeans/modules/subversion/SvnModuleConfig.java
--- subversion/src/org/netbeans/modules/subversion/SvnModuleConfig.java
+++ subversion/src/org/netbeans/modules/subversion/SvnModuleConfig.java
@@ -110,6 +110,7 @@
     private static final SvnModuleConfig INSTANCE = new SvnModuleConfig();    
         
     private Map<String, Object[]> urlCredentials;
+    private String userPreferredFactory = "";
     
     public static SvnModuleConfig getDefault() {
         return INSTANCE;
@@ -596,6 +597,7 @@
             getPreferences().put(PROP_PREFERRED_FACTORY, preferredFactory);
             setForceCommnandlineClient(false);
             factory = ""; // override the global setting
+            userPreferredFactory = preferredFactory;
         }
     }
 
@@ -605,4 +607,12 @@
         }
         return factory;
     }
+
+    public String getForcedSvnFactory () {
+        String fact = getGlobalSvnFactory();
+        if (fact.isEmpty()) {
+            fact = userPreferredFactory;
+        }
+        return fact;
+    }
 }
Index: subversion/src/org/netbeans/modules/subversion/client/SvnClientFactory.java
--- subversion/src/org/netbeans/modules/subversion/client/SvnClientFactory.java
+++ subversion/src/org/netbeans/modules/subversion/client/SvnClientFactory.java
@@ -284,11 +284,12 @@
         String jhlInitFile = Places.getUserDirectory().getAbsolutePath() + "/config/svn/jhlinit";
         File initFile = new File(jhlInitFile);
 
-        if(checkJavahlCrash(initFile)) {
+        if(checkJavahlCrash(initFile) && !SvnClientFactory.FACTORY_TYPE_JAVAHL.equals(SvnModuleConfig.getDefault().getForcedSvnFactory())) {
             return false;
         }
         try {
-            if(!initFile.exists()) initFile.createNewFile();
+            initFile.delete();
+            initFile.createNewFile();
         } catch (IOException ex) {
             // should not happen
             LOG.log(Level.INFO, null, ex);