public interface ISvnMerger extends ISVNMerger
SVNKit
in merging operations.
Merge drivers are created by a merger factory implementing the
ISVNMergerFactory
interface.
DefaultSvnMerger
Modifier and Type | Method and 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 changes
propChanges based on serverBaseProperties
into the working copy localAbsPath |
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.
|
mergeProperties, 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
baseMerger
- resultFile
- targetAbspath
- working copy absolute path of the targetdetranslatedTargetAbspath
- leftAbspath
- rightAbspath
- targetLabel
- leftLabel
- rightLabel
- options
- merge options to take into accountstyle
- SVNException
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
propChanges
based on serverBaseProperties
into the working copy localAbsPath
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
- 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 doneconflictResolver
- SVNException
Copyright © 2004-2012 TMate Software Ltd. All Rights Reserved.