|
SVNKit Home | |||||||||
| PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
| SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD | |||||||||
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.
| Method Summary | |
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 OutputStream. |
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 OutputStream. |
| Method Detail |
public SVNStatusType mergeText(File baseFile,
File localFile,
File latestFile,
boolean dryRun,
SVNDiffOptions options,
OutputStream out)
throws SVNException
OutputStream.
baseFile - the earliest file of the two to be compared to
generate deltalocalFile - a local WC file against which the delta
should be appliedlatestFile - the latest file of the two to be compared to
generate deltadryRun - if true - only
try to merge (to find out if an operation can succeed)
without actual mergingoptions - diff options to applyout - an output stream where the result file contents
should be written to
SVNStatusType.MERGED
SVNException
public SVNStatusType mergeBinary(File baseFile,
File localFile,
File latestFile,
boolean dryRun,
OutputStream out)
throws SVNException
OutputStream.
baseFile - the earliest file of the two to generate deltaslocalFile - a local WC file against which the deltas
should be appliedlatestFile - the latest file of the two to generate deltasdryRun - if true - only
try to merge (to find out if an operation can succeed)
without actual mergingout - an output stream where the result file contents
should be written to
SVNStatusType.MERGED
SVNException
|
SVNKit Home | |||||||||
| PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
| SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD | |||||||||