public class DiffLib
extends java.lang.Object
Constructor and Description |
---|
DiffLib() |
Modifier and Type | Method and Description |
---|---|
boolean |
fileDiff(java.lang.String originalFile,
java.lang.String modifiedFile,
SVNUtil.DiffOptions diffOptions,
java.lang.String originalHeader,
java.lang.String modifiedHeader,
java.lang.String headerEncoding,
java.lang.String relativeToDir,
java.io.OutputStream resultStream) |
boolean |
fileMerge(java.lang.String originalFile,
java.lang.String modifiedFile,
java.lang.String latestFile,
SVNUtil.DiffOptions diffOptions,
java.lang.String conflictOriginal,
java.lang.String conflictModified,
java.lang.String conflictLatest,
java.lang.String conflistSeparator,
SVNUtil.ConflictDisplayStyle conflictStyle,
java.io.OutputStream resultStream) |
public boolean fileDiff(java.lang.String originalFile, java.lang.String modifiedFile, SVNUtil.DiffOptions diffOptions, java.lang.String originalHeader, java.lang.String modifiedHeader, java.lang.String headerEncoding, java.lang.String relativeToDir, java.io.OutputStream resultStream) throws ClientException
ClientException
SVNUtil.fileDiff
public boolean fileMerge(java.lang.String originalFile, java.lang.String modifiedFile, java.lang.String latestFile, SVNUtil.DiffOptions diffOptions, java.lang.String conflictOriginal, java.lang.String conflictModified, java.lang.String conflictLatest, java.lang.String conflistSeparator, SVNUtil.ConflictDisplayStyle conflictStyle, java.io.OutputStream resultStream) throws ClientException
ClientException
SVNUtil.fileMerge