SVNMergeFileSet mergeFileSet = new SVNMergeFileSet(this, log, base, tmpTarget, localPath, latest,
resultFile, copyFromText, mimeType);
mergeFileSet.setMergeLabels(baseLabel, localLabel, latestLabel);
SVNMergeResult mergeResult;
try {
mergeResult = merger.mergeText(mergeFileSet, dryRun, options);
}
finally {
if (dryRun) {
SVNFileUtil.deleteFile(resultFile);
}
}
mergeFileSet.dispose();
if (saveLog) {
log.save();
}
return mergeResult.getMergeStatus();
}