public class DefaultSVNMerger extends AbstractSVNMerger implements ISVNMerger
Constructor and Description |
---|
DefaultSVNMerger(byte[] start,
byte[] sep,
byte[] end)
Deprecated.
|
DefaultSVNMerger(byte[] start,
byte[] sep,
byte[] end,
ISVNConflictHandler callback)
Deprecated.
|
DefaultSVNMerger(byte[] start,
byte[] sep,
byte[] end,
ISVNConflictHandler callback,
SVNDiffConflictChoiceStyle style) |
Modifier and Type | Method and Description |
---|---|
SVNDiffConflictChoiceStyle |
getDiffConflictStyle() |
protected DefaultSVNMergerAction |
getMergeAction(SVNMergeFileSet files,
SVNMergeResult mergeResult) |
protected SVNMergeResult |
handleChooseBase(SVNMergeFileSet files) |
protected SVNMergeResult |
handleChooseConflicted(boolean chooseMine,
SVNMergeFileSet files) |
protected SVNMergeResult |
handleChooseMerged(SVNMergeFileSet files,
SVNMergeResult mergeResult) |
protected SVNMergeResult |
handleChooseRepository(SVNMergeFileSet files) |
protected SVNMergeResult |
handleChooseWorking(SVNMergeFileSet files) |
protected SVNMergeResult |
handleMarkBinaryConflicted(SVNMergeFileSet files) |
protected SVNMergeResult |
handleMarkConflicted(SVNMergeFileSet files) |
protected SVNMergeResult |
handleMarkResolved(SVNMergeFileSet files,
SVNMergeResult mergeResult) |
protected SVNMergeResult |
handleMarkTextConflicted(SVNMergeFileSet files) |
protected void |
makeBinaryConflictEntry(SVNMergeFileSet files,
java.lang.String newFilePath,
java.lang.String oldFilePath) |
protected void |
makeTextConflictEntry(SVNMergeFileSet files,
java.lang.String mineFilePath,
java.lang.String newFilePath,
java.lang.String oldFilePath) |
protected SVNStatusType |
mergeBinary(java.io.File baseFile,
java.io.File localFile,
java.io.File repositoryFile,
SVNDiffOptions options,
java.io.File resultFile) |
SVNMergeResult |
mergeProperties(java.lang.String localPath,
SVNProperties workingProperties,
SVNProperties baseProperties,
SVNProperties serverBaseProps,
SVNProperties propDiff,
SVNAdminArea adminArea,
SVNLog log,
boolean baseMerge,
boolean dryRun)
Given
adminArea /localPath and property changes (propDiff ) based
on serverBaseProps , merges the changes into the working copy. |
protected SVNStatusType |
mergeText(java.io.File baseFile,
java.io.File localFile,
java.io.File latestFile,
SVNDiffOptions options,
java.io.File resultFile) |
protected void |
postMergeCleanup(SVNMergeFileSet files) |
protected SVNMergeResult |
processMergedFiles(SVNMergeFileSet files,
SVNMergeResult mergeResult) |
void |
setDiffConflictStyle(SVNDiffConflictChoiceStyle diffConflictStyle) |
getConflictEndMarker, getConflictSeparatorMarker, getConflictStartMarker, getDiffOptions, mergeText
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
mergeText
public DefaultSVNMerger(byte[] start, byte[] sep, byte[] end)
DefaultSVNMerger(byte[], byte[], byte[], ISVNConflictHandler, SVNDiffConflictChoiceStyle)
insteadstart
- sep
- end
- callback
- public DefaultSVNMerger(byte[] start, byte[] sep, byte[] end, ISVNConflictHandler callback)
DefaultSVNMerger(byte[], byte[], byte[], ISVNConflictHandler, SVNDiffConflictChoiceStyle)
insteadstart
- sep
- end
- callback
- public DefaultSVNMerger(byte[] start, byte[] sep, byte[] end, ISVNConflictHandler callback, SVNDiffConflictChoiceStyle style)
public SVNMergeResult mergeProperties(java.lang.String localPath, SVNProperties workingProperties, SVNProperties baseProperties, SVNProperties serverBaseProps, SVNProperties propDiff, SVNAdminArea adminArea, SVNLog log, boolean baseMerge, boolean dryRun) throws SVNException
ISVNMerger
adminArea
/localPath
and property changes (propDiff
) based
on serverBaseProps
, merges the changes into the working copy.mergeProperties
in interface ISVNMerger
localPath
- working copy path base nameworkingProperties
- working propertiesbaseProperties
- pristine propertiesserverBaseProps
- properties that come from the serverpropDiff
- property changes that come from the repositoryadminArea
- admin area object representing the .svn<./code> admin area of
the target which properties are merged
log
- loggerbaseMerge
- if false, then changes only working properties;
otherwise, changes both the base and working propertiesdryRun
- if true, merge is simulated only, no real
changes are doneSVNException
public SVNDiffConflictChoiceStyle getDiffConflictStyle()
public void setDiffConflictStyle(SVNDiffConflictChoiceStyle diffConflictStyle)
protected SVNStatusType mergeBinary(java.io.File baseFile, java.io.File localFile, java.io.File repositoryFile, SVNDiffOptions options, java.io.File resultFile) throws SVNException
mergeBinary
in class AbstractSVNMerger
SVNException
protected SVNStatusType mergeText(java.io.File baseFile, java.io.File localFile, java.io.File latestFile, SVNDiffOptions options, java.io.File resultFile) throws SVNException
mergeText
in class AbstractSVNMerger
SVNException
protected SVNMergeResult processMergedFiles(SVNMergeFileSet files, SVNMergeResult mergeResult) throws SVNException
processMergedFiles
in class AbstractSVNMerger
SVNException
protected DefaultSVNMergerAction getMergeAction(SVNMergeFileSet files, SVNMergeResult mergeResult) throws SVNException
SVNException
protected SVNMergeResult handleChooseBase(SVNMergeFileSet files) throws SVNException
SVNException
protected SVNMergeResult handleChooseRepository(SVNMergeFileSet files) throws SVNException
SVNException
protected SVNMergeResult handleChooseConflicted(boolean chooseMine, SVNMergeFileSet files) throws SVNException
SVNException
protected SVNMergeResult handleChooseWorking(SVNMergeFileSet files) throws SVNException
SVNException
protected SVNMergeResult handleMarkConflicted(SVNMergeFileSet files) throws SVNException
SVNException
protected SVNMergeResult handleMarkBinaryConflicted(SVNMergeFileSet files) throws SVNException
SVNException
protected void makeBinaryConflictEntry(SVNMergeFileSet files, java.lang.String newFilePath, java.lang.String oldFilePath) throws SVNException
SVNException
protected SVNMergeResult handleMarkTextConflicted(SVNMergeFileSet files) throws SVNException
SVNException
protected void makeTextConflictEntry(SVNMergeFileSet files, java.lang.String mineFilePath, java.lang.String newFilePath, java.lang.String oldFilePath) throws SVNException
SVNException
protected SVNMergeResult handleChooseMerged(SVNMergeFileSet files, SVNMergeResult mergeResult) throws SVNException
SVNException
protected SVNMergeResult handleMarkResolved(SVNMergeFileSet files, SVNMergeResult mergeResult) throws SVNException
SVNException
protected void postMergeCleanup(SVNMergeFileSet files) throws SVNException
SVNException
Copyright © 2004-2012 TMate Software Ltd. All Rights Reserved.