| org.tmatesoft.svn.core.wc.ISVNMerger
All known Subclasses: org.tmatesoft.svn.core.internal.wc.DefaultSVNMerger,
| ISVNMerger | | public interface ISVNMerger (Code) | | ISVNMerger is the merger driver interface used by SVNKit in
merging operations.
Merger drivers are created by a merger factory implementing the
ISVNMergerFactory interface. Read more about that interface to
find out how to get a default implementation of ISVNMerger.
version:
1.1.1
author:
TMate Software Ltd. |
| Method Summary | |
| public SVNStatusType | mergeBinary(File baseFile, File localFile, File latestFile, boolean dryRun, OutputStream out)
Generates deltas given two binary files, applies
the deltas against a local file and writes the merge result to the
given
java.io.OutputStream . | | public SVNStatusType | mergeText(File baseFile, File localFile, File latestFile, boolean dryRun, SVNDiffOptions options, OutputStream out)
Generates deltas given the two text source files to be compared, applies
the deltas against a local file and writes the merge result to the
given
java.io.OutputStream . |
| mergeBinary | | public SVNStatusType mergeBinary(File baseFile, File localFile, File latestFile, boolean dryRun, OutputStream out) throws SVNException(Code) | | Generates deltas given two binary files, applies
the deltas against a local file and writes the merge result to the
given
java.io.OutputStream .
Parameters:
baseFile - the earliest file of the two to generate deltas
Parameters:
localFile - a local WC file against which the deltasshould be applied
Parameters:
latestFile - the latest file of the two to generate deltas
Parameters:
dryRun - if true - only try to merge (to find out if an operation can succeed) without actual merging
Parameters:
out - an output stream where the result file contentsshould be written to a result status of the operation; if success - returns SVNStatusType.MERGED
throws:
SVNException - |
| mergeText | | public SVNStatusType mergeText(File baseFile, File localFile, File latestFile, boolean dryRun, SVNDiffOptions options, OutputStream out) throws SVNException(Code) | | Generates deltas given the two text source files to be compared, applies
the deltas against a local file and writes the merge result to the
given
java.io.OutputStream .
Parameters:
baseFile - the earliest file of the two to be compared togenerate delta
Parameters:
localFile - a local WC file against which the deltashould be applied
Parameters:
latestFile - the latest file of the two to be compared togenerate delta
Parameters:
dryRun - if true - only try to merge (to find out if an operation can succeed) without actual merging
Parameters:
options - diff options to apply
Parameters:
out - an output stream where the result file contentsshould be written to a result status of the operation; if success - returns SVNStatusType.MERGED
throws:
SVNException - |
|
|