protected SVNRemoteDiffEditor getMergeReportEditor(long defaultStart, long revision, SVNAdminArea adminArea, SVNDepth depth, AbstractDiffCallback mergeCallback, SVNRemoteDiffEditor editor) throws SVNException {
if (skipExtendedMerge()) {
return super.getMergeReportEditor(defaultStart, revision, adminArea, depth, mergeCallback, editor);
}
if (editor == null) {
editor = new SVNExtendedMergeEditor(this, getExtendedMergeCallback(), adminArea, adminArea.getRoot(),
mergeCallback, myPrimaryURL, myRepository2, defaultStart, revision, myIsDryRun, depth, this, this);
} else {
editor.reset(defaultStart, revision);
}
File tmp = mergeCallback.createTempDirectory();
setTempDirectory(tmp);
return editor;
}