org.tmatesoft.svn.core.wc

Interface ISVNMerger

public interface ISVNMerger

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
SVNStatusTypemergeBinary(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.
SVNStatusTypemergeText(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.

Method Detail

mergeBinary

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.

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 MERGED

Throws: SVNException

mergeText

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.

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 MERGED

Throws: SVNException

Copyright © 2004-2007 TMate Software Ltd. All Rights Reserved.