org.tmatesoft.svn.core.internal.wc

Class AbstractSVNMerger

java.lang.Object

org.tmatesoft.svn.core.internal.wc.AbstractSVNMerger

All Implemented Interfaces:

ISVNMerger

Direct Known Subclasses:

DefaultSVNMerger

public abstract class AbstractSVNMerger
extends java.lang.Object
implements ISVNMerger

Version:

1.3

Author:

TMate Software Ltd.

Constructor Summary

Constructors

Modifier	Constructor and Description
protected	AbstractSVNMerger(byte[] start, byte[] sep, byte[] end)

Method Summary

Modifier and Type	Method and Description
protected byte[]	getConflictEndMarker()
protected byte[]	getConflictSeparatorMarker()
protected byte[]	getConflictStartMarker()
protected SVNDiffOptions	getDiffOptions()
protected abstract SVNStatusType	mergeBinary(java.io.File baseFile, java.io.File localFile, java.io.File repositoryFile, SVNDiffOptions options, java.io.File resultFile)
protected abstract SVNStatusType	mergeText(java.io.File baseFile, java.io.File localFile, java.io.File repositoryFile, SVNDiffOptions options, java.io.File resultFile)
SVNMergeResult	mergeText(SVNMergeFileSet files, boolean dryRun, SVNDiffOptions options) Performs a text merge.
protected abstract SVNMergeResult	processMergedFiles(SVNMergeFileSet files, SVNMergeResult mergeResult)

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Methods inherited from interface org.tmatesoft.svn.core.wc.ISVNMerger

mergeProperties

Constructor Detail

AbstractSVNMerger

protected AbstractSVNMerger(byte[] start,
                            byte[] sep,
                            byte[] end)

Method Detail

getConflictSeparatorMarker

protected byte[] getConflictSeparatorMarker()

getConflictStartMarker

protected byte[] getConflictStartMarker()

getConflictEndMarker

protected byte[] getConflictEndMarker()

getDiffOptions

protected SVNDiffOptions getDiffOptions()

mergeText

public SVNMergeResult mergeText(SVNMergeFileSet files,
                                boolean dryRun,
                                SVNDiffOptions options)
                         throws SVNException

Description copied from interface: ISVNMerger

Performs a text merge.

Specified by:

mergeText in interface ISVNMerger

Parameters:

files - files invoked in merge

dryRun - if true, merge is simulated only, no real changes are done

options - merge options to take into account

Returns:

result of merging

Throws:

SVNException

processMergedFiles

protected abstract SVNMergeResult processMergedFiles(SVNMergeFileSet files,
                                                     SVNMergeResult mergeResult)
                                              throws SVNException

Throws:

SVNException

mergeText

protected abstract SVNStatusType mergeText(java.io.File baseFile,
                                           java.io.File localFile,
                                           java.io.File repositoryFile,
                                           SVNDiffOptions options,
                                           java.io.File resultFile)
                                    throws SVNException

Throws:

SVNException

mergeBinary

protected abstract SVNStatusType mergeBinary(java.io.File baseFile,
                                             java.io.File localFile,
                                             java.io.File repositoryFile,
                                             SVNDiffOptions options,
                                             java.io.File resultFile)
                                      throws SVNException

Throws:

SVNException