org.apache.subversion.javahl.util
Class DiffLib
java.lang.Object
org.apache.subversion.javahl.util.DiffLib
public class DiffLib
- extends Object
Encapsulates utility functions provided by libsvn_diff.
- Since:
- 1.9
Method Summary |
boolean |
fileDiff(String originalFile,
String modifiedFile,
SVNUtil.DiffOptions diffOptions,
String originalHeader,
String modifiedHeader,
String headerEncoding,
String relativeToDir,
OutputStream resultStream)
|
boolean |
fileMerge(String originalFile,
String modifiedFile,
String latestFile,
SVNUtil.DiffOptions diffOptions,
String conflictOriginal,
String conflictModified,
String conflictLatest,
String conflistSeparator,
SVNUtil.ConflictDisplayStyle conflictStyle,
OutputStream resultStream)
|
Methods inherited from class java.lang.Object |
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait |
DiffLib
public DiffLib()
fileDiff
public boolean fileDiff(String originalFile,
String modifiedFile,
SVNUtil.DiffOptions diffOptions,
String originalHeader,
String modifiedHeader,
String headerEncoding,
String relativeToDir,
OutputStream resultStream)
throws ClientException
- Throws:
ClientException
- See Also:
SVNUtil.fileDiff
fileMerge
public boolean fileMerge(String originalFile,
String modifiedFile,
String latestFile,
SVNUtil.DiffOptions diffOptions,
String conflictOriginal,
String conflictModified,
String conflictLatest,
String conflistSeparator,
SVNUtil.ConflictDisplayStyle conflictStyle,
OutputStream resultStream)
throws ClientException
- Throws:
ClientException
- See Also:
SVNUtil.fileMerge