Start line:  
End line:  

Snippet Preview

Snippet HTML Code

Stack Overflow Questions
 /*
  * ====================================================================
  * Copyright (c) 2004-2006 TMate Software Ltd.  All rights reserved.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
  * are also available at http://svnkit.com/license.html
  * If newer versions of this license are posted there, you may use a
  * newer version instead, at your option.
 * ====================================================================
 */
package org.tmatesoft.svn.core.wc;
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.

Author(s):
TMate Software Ltd.
Version:
1.1.0
public interface ISVNMerger {
    
    
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 SVNStatusType.MERGED
Throws:
org.tmatesoft.svn.core.SVNException
    public SVNStatusType mergeText(File baseFileFile localFileFile latestFileboolean dryRunSVNDiffOptions optionsOutputStream outthrows SVNException;

    
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 SVNStatusType.MERGED
Throws:
org.tmatesoft.svn.core.SVNException
    public SVNStatusType mergeBinary(File baseFileFile localFileFile latestFileboolean dryRunOutputStream outthrows SVNException;
New to GrepCode? Check out our FAQ X