Class AbstractSVNMerger
java.lang.Object
org.tmatesoft.svn.core.internal.wc.AbstractSVNMerger
- All Implemented Interfaces:
ISVNMerger
- Direct Known Subclasses:
DefaultSVNMerger
- Version:
- 1.3
-
Field Summary
FieldsModifier and TypeFieldDescriptionprivate SVNDiffOptions
private byte[]
private byte[]
private byte[]
-
Constructor Summary
Constructors -
Method Summary
Modifier and TypeMethodDescriptionprotected byte[]
protected byte[]
protected byte[]
protected SVNDiffOptions
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) 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
-
Field Details
-
myStart
private byte[] myStart -
mySeparator
private byte[] mySeparator -
myEnd
private byte[] myEnd -
myDiffOptions
-
-
Constructor Details
-
AbstractSVNMerger
protected AbstractSVNMerger(byte[] start, byte[] sep, byte[] end)
-
-
Method Details
-
getConflictSeparatorMarker
protected byte[] getConflictSeparatorMarker() -
getConflictStartMarker
protected byte[] getConflictStartMarker() -
getConflictEndMarker
protected byte[] getConflictEndMarker() -
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 interfaceISVNMerger
- Parameters:
files
- files invoked in mergedryRun
- if true, merge is simulated only, no real changes are doneoptions
- 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
-