/** * @deprecated */ protected void doFileMerge(SVNURL url1, long revision1, SVNURL url2, long revision2, File targetWCPath, SVNAdminArea adminArea, boolean sourcesRelated) throws SVNException { doFileMerge(null, url1, revision1, url2, revision2, targetWCPath, adminArea, sourcesRelated); }
doFileMerge(resultCatalog, url1, revision1, url2, revision2, target, adminArea, sourcesRelated); } else if (targetEntry.isDirectory()) { doDirectoryMerge(resultCatalog, url1, revision1, url2, revision2, targetEntry, adminArea, depth);
doFileMerge(url1, revision1, url2, revision2, target, adminArea, sourcesRelated); } else if (targetEntry.isDirectory()) { doDirectoryMerge(url1, revision1, url2, revision2, targetEntry, adminArea, depth);
doFileMerge(url1, revision1, url2, revision2, target, adminArea, sourcesRelated); } else if (targetEntry.isDirectory()) { doDirectoryMerge(url1, revision1, url2, revision2, targetEntry, adminArea, depth);