Package org.tmatesoft.svn.core.wc2
Interface ISvnMerger
-
- All Superinterfaces:
ISVNMerger
- All Known Implementing Classes:
DefaultSvnMerger
public interface ISvnMerger extends ISVNMerger
Merge driver interface used bySVNKit
in merging operations.Merge drivers are created by a merger factory implementing the
ISVNMergerFactory
interface.- Version:
- 1.7
- Author:
- TMate Software Ltd.
- See Also:
DefaultSvnMerger
-
-
Method Summary
All Methods Instance Methods Abstract Methods Modifier and Type Method Description SvnMergeResult
mergeProperties(ISvnMerger baseMerger, java.io.File localAbsPath, SVNNodeKind kind, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, SVNProperties serverBaseProperties, SVNProperties pristineProperties, SVNProperties actualProperties, SVNProperties propChanges, boolean baseMerge, boolean dryRun, ISVNConflictHandler conflictResolver)
Merges the property changespropChanges
based onserverBaseProperties
into the working copylocalAbsPath
SvnMergeResult
mergeText(ISvnMerger baseMerger, java.io.File resultFile, java.io.File targetAbspath, java.io.File detranslatedTargetAbspath, java.io.File leftAbspath, java.io.File rightAbspath, java.lang.String targetLabel, java.lang.String leftLabel, java.lang.String rightLabel, SVNDiffOptions options, SVNDiffConflictChoiceStyle style)
Performs a text merge.-
Methods inherited from interface org.tmatesoft.svn.core.wc.ISVNMerger
mergeProperties, mergeText
-
-
-
-
Method Detail
-
mergeText
SvnMergeResult mergeText(ISvnMerger baseMerger, java.io.File resultFile, java.io.File targetAbspath, java.io.File detranslatedTargetAbspath, java.io.File leftAbspath, java.io.File rightAbspath, java.lang.String targetLabel, java.lang.String leftLabel, java.lang.String rightLabel, SVNDiffOptions options, SVNDiffConflictChoiceStyle style) throws SVNException
Performs a text merge.- Parameters:
baseMerger
-resultFile
-targetAbspath
- working copy absolute path of the targetdetranslatedTargetAbspath
-leftAbspath
-rightAbspath
-targetLabel
-leftLabel
-rightLabel
-options
- merge options to take into accountstyle
-- Returns:
- result of merging
- Throws:
SVNException
-
mergeProperties
SvnMergeResult mergeProperties(ISvnMerger baseMerger, java.io.File localAbsPath, SVNNodeKind kind, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, SVNProperties serverBaseProperties, SVNProperties pristineProperties, SVNProperties actualProperties, SVNProperties propChanges, boolean baseMerge, boolean dryRun, ISVNConflictHandler conflictResolver) throws SVNException
Merges the property changespropChanges
based onserverBaseProperties
into the working copylocalAbsPath
- Parameters:
baseMerger
-localAbsPath
- working copy absolute pathkind
- node kindleftVersion
-rightVersion
-serverBaseProperties
- properties that come from the serverpristineProperties
- pristine propertiesactualProperties
- actual (working) propertiespropChanges
- property changes that come from the repositorybaseMerge
- iffalse
, then changes only working properties; otherwise, changes both the base and working propertiesdryRun
- iftrue
, merge is simulated only, no real changes are doneconflictResolver
-- Returns:
- result of merging
- Throws:
SVNException
-
-