Uses of Interface
org.tmatesoft.svn.core.wc2.ISvnMerger

Packages that use ISvnMerger

Package	Description
org.tmatesoft.svn.core.internal.wc17
org.tmatesoft.svn.core.wc2	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 ISvnMerger in org.tmatesoft.svn.core.internal.wc17

Classes in org.tmatesoft.svn.core.internal.wc17 that implement ISvnMerger

Modifier and Type	Class and Description
class	DefaultSvnMerger

Methods in org.tmatesoft.svn.core.internal.wc17 with parameters of type ISvnMerger

Modifier and Type	Method and Description
SvnMergeResult	DefaultSvnMerger.mergeProperties(ISvnMerger baseMerger, File localAbsPath, SVNNodeKind kind, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, SVNProperties serverBaseProperties, SVNProperties pristineProperties, SVNProperties actualProperties, SVNProperties propChanges, boolean baseMerge, boolean dryRun, ISVNConflictHandler conflictResolver)
SvnMergeResult	DefaultSvnMerger.mergeText(ISvnMerger baseMerger, File resultFile, File targetAbspath, File detranslatedTargetAbspath, File leftAbspath, File rightAbspath, String targetLabel, String leftLabel, String rightLabel, SVNDiffOptions options, SVNDiffConflictChoiceStyle style)

Uses of ISvnMerger in org.tmatesoft.svn.core.wc2

Methods in org.tmatesoft.svn.core.wc2 with parameters of type ISvnMerger

Modifier and Type	Method and Description
SvnMergeResult	ISvnMerger.mergeProperties(ISvnMerger baseMerger, 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	ISvnMerger.mergeText(ISvnMerger baseMerger, File resultFile, File targetAbspath, File detranslatedTargetAbspath, File leftAbspath, File rightAbspath, String targetLabel, String leftLabel, String rightLabel, SVNDiffOptions options, SVNDiffConflictChoiceStyle style) Performs a text merge.