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.
|
Modifier and Type | Class and Description |
---|---|
class |
DefaultSvnMerger |
Modifier and Type | Method and Description |
---|---|
SvnMergeResult |
DefaultSvnMerger.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) |
SvnMergeResult |
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) |
Modifier and Type | Method and Description |
---|---|
SvnMergeResult |
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 changes
propChanges based on serverBaseProperties
into the working copy localAbsPath |
SvnMergeResult |
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.
|
Copyright © 2020. All rights reserved.