public abstract class AbstractSVNMerger extends java.lang.Object implements ISVNMerger
Modifier | Constructor and Description |
---|---|
protected |
AbstractSVNMerger(byte[] start,
byte[] sep,
byte[] end) |
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) |
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
mergeProperties
protected AbstractSVNMerger(byte[] start, byte[] sep, byte[] end)
protected byte[] getConflictSeparatorMarker()
protected byte[] getConflictStartMarker()
protected byte[] getConflictEndMarker()
protected SVNDiffOptions getDiffOptions()
public SVNMergeResult mergeText(SVNMergeFileSet files, boolean dryRun, SVNDiffOptions options) throws SVNException
ISVNMerger
mergeText
in interface ISVNMerger
files
- files invoked in mergedryRun
- if true, merge is simulated only, no real
changes are doneoptions
- merge options to take into accountSVNException
protected abstract SVNMergeResult processMergedFiles(SVNMergeFileSet files, SVNMergeResult mergeResult) throws SVNException
SVNException
protected abstract SVNStatusType mergeText(java.io.File baseFile, java.io.File localFile, java.io.File repositoryFile, SVNDiffOptions options, java.io.File resultFile) throws SVNException
SVNException
protected abstract SVNStatusType mergeBinary(java.io.File baseFile, java.io.File localFile, java.io.File repositoryFile, SVNDiffOptions options, java.io.File resultFile) throws SVNException
SVNException
Copyright © 2004-2012 TMate Software Ltd. All Rights Reserved.