public SVNMergeCallback createMergeCallback(SVNMergeDriver mergeDriver, SVNAdminArea adminArea, SVNURL url, SVNDiffOptions mergeOptions, Map conflictedPaths, boolean force, boolean dryRun) { int maxVersion = getMaxFormatVersion(); if (maxVersion < SVNAdminAreaFactory.WC_FORMAT_16) { return new SVNMergeCallback15(adminArea, url, force, dryRun, mergeOptions, conflictedPaths, mergeDriver); } return new SVNMergeCallback(adminArea, url, force, dryRun, mergeOptions, conflictedPaths, mergeDriver); }
public SVNMergeCallback createMergeCallback(SVNMergeDriver mergeDriver, SVNAdminArea adminArea, SVNURL url, SVNDiffOptions mergeOptions, Map conflictedPaths, boolean force, boolean dryRun) { int maxVersion = getMaxFormatVersion(); if (maxVersion < SVNAdminAreaFactory.WC_FORMAT_16) { return new SVNMergeCallback15(adminArea, url, force, dryRun, mergeOptions, conflictedPaths, mergeDriver); } return new SVNMergeCallback(adminArea, url, force, dryRun, mergeOptions, conflictedPaths, mergeDriver); }
public SVNMergeCallback createMergeCallback(SVNMergeDriver mergeDriver, SVNAdminArea adminArea, SVNURL url, SVNDiffOptions mergeOptions, Map conflictedPaths, boolean force, boolean dryRun) { int maxVersion = getMaxFormatVersion(); if (maxVersion < SVNAdminAreaFactory.WC_FORMAT_16) { return new SVNMergeCallback15(adminArea, url, force, dryRun, mergeOptions, conflictedPaths, mergeDriver); } return new SVNMergeCallback(adminArea, url, force, dryRun, mergeOptions, conflictedPaths, mergeDriver); }
SVNMergeCallback callback = new SVNMergeCallback(info, url2, force, dryRun, getMergeOptions()); mergeResult = callback.fileChanged(name, f1, f2, rev1[0], rev2[0], mimeType1, mimeType2, props1, propsDiff); } finally {
SVNRepository repository2 = createRepository(url1, false); SVNMergeCallback callback = new SVNMergeCallback(info, url2, force, dryRun, getMergeOptions()); SVNRemoteDiffEditor editor = new SVNRemoteDiffEditor(info, info.getTarget().getRoot(), callback, repository2, rev1, rev2, dryRun, this, this);