# This patch file was generated by NetBeans IDE # This patch can be applied using context Tools: Apply Diff Patch action on respective folder. # It uses platform neutral UTF-8 encoding. # Above lines and this line are ignored by the patching process. Index: versioncontrol/mercurial/src/org/netbeans/modules/mercurial/MercurialInterceptor.java --- versioncontrol/mercurial/src/org/netbeans/modules/mercurial/MercurialInterceptor.java Base (1.18) +++ versioncontrol/mercurial/src/org/netbeans/modules/mercurial/MercurialInterceptor.java Locally Modified (Based On 1.18) @@ -156,12 +156,11 @@ file.delete(); if (root == null) return; for (File dir : dirsToDelete) { - File tmpFile = file; - do { - if (tmpFile.getParentFile().equals(dir)) return; + File tmpFile = file.getParentFile(); + while (tmpFile != null) { + if (tmpFile.equals(dir)) return; tmpFile = tmpFile.getParentFile(); } - while (tmpFile != null); } HgProgressSupport support = new HgProgressSupport() { public void perform() { @@ -247,7 +246,7 @@ HgCommand.doRename(root, srcFile, dstFile); } } catch (HgException e) { - Mercurial.LOG.log(Level.FINE, "Mercurial failed to rename: File: {0} {1} {2}", new Object[] {srcFile.getAbsolutePath(), dstFile.getAbsolutePath()}); // NOI18N + Mercurial.LOG.log(Level.FINE, "Mercurial failed to rename: File: {0} {1}", new Object[] {srcFile.getAbsolutePath(), dstFile.getAbsolutePath()}); // NOI18N } } };