Interface ISVNMerger

public SVNStatusType mergeBinary(File baseFile,
                                 File localFile,
                                 File latestFile,
                                 boolean dryRun,
                                 OutputStream out)
            throws SVNException

Generates deltas given two binary files, applies the deltas against a local file and writes the merge result to the given OutputStream.

Parameters:

baseFile - the earliest file of the two to generate deltas

localFile - a local WC file against which the deltas should be applied

latestFile - the latest file of the two to generate deltas

dryRun - if true - only try to merge (to find out if an operation can succeed) without actual merging

out - an output stream where the result file contents should be written to

Returns:

a result status of the operation; if success - returns SVNStatusType.MERGED

Throws:

SVNException -

public SVNStatusType mergeText(File baseFile,
                               File localFile,
                               File latestFile,
                               boolean dryRun,
                               SVNDiffOptions options,
                               OutputStream out)
            throws SVNException

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.

Parameters:

baseFile - the earliest file of the two to be compared to generate delta

localFile - a local WC file against which the delta should be applied

latestFile - the latest file of the two to be compared to generate delta

dryRun - if true - only try to merge (to find out if an operation can succeed) without actual merging

options - diff options to apply

out - an output stream where the result file contents should be written to

Returns:

a result status of the operation; if success - returns SVNStatusType.MERGED

Throws:

SVNException -