Uses of Class
org.tmatesoft.svn.core.wc2.SvnMergeResult
Packages that use SvnMergeResult
Package
Description
NEW: this package contains command-style API to perform most of
Subversion operations on the level of abstraction similar to that of the
command line client.
-
Uses of SvnMergeResult in org.tmatesoft.svn.core.internal.wc17
Methods in org.tmatesoft.svn.core.internal.wc17 that return SvnMergeResultModifier and TypeMethodDescriptionDefaultSvnMerger.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) DefaultSvnMerger.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) -
Uses of SvnMergeResult in org.tmatesoft.svn.core.wc2
Methods in org.tmatesoft.svn.core.wc2 that return SvnMergeResultModifier and TypeMethodDescriptionstatic SvnMergeResult
SvnMergeResult.create
(SVNStatusType mergeOutcome) Creates merge result object and initializes it with merge outcome (status).ISvnMerger.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
ISvnMerger.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.