Uses of Class
org.tmatesoft.svn.core.wc.SVNMergeResult
-
Packages that use SVNMergeResult Package Description org.tmatesoft.svn.core.internal.wc org.tmatesoft.svn.core.internal.wc17 org.tmatesoft.svn.core.wc This package provides a high-level API for managing Working Copies in a way compatible with the native SVN command line client. -
-
Uses of SVNMergeResult in org.tmatesoft.svn.core.internal.wc
Methods in org.tmatesoft.svn.core.internal.wc with parameters of type SVNMergeResult Modifier and Type Method Description protected DefaultSVNMergerAction
DefaultSVNMerger. getMergeAction(SVNMergeFileSet files, SVNMergeResult mergeResult)
protected SVNMergeResult
DefaultSVNMerger. handleChooseMerged(SVNMergeFileSet files, SVNMergeResult mergeResult)
protected SVNMergeResult
DefaultSVNMerger. handleMarkResolved(SVNMergeFileSet files, SVNMergeResult mergeResult)
protected abstract SVNMergeResult
AbstractSVNMerger. processMergedFiles(SVNMergeFileSet files, SVNMergeResult mergeResult)
protected SVNMergeResult
DefaultSVNMerger. processMergedFiles(SVNMergeFileSet files, SVNMergeResult mergeResult)
-
Uses of SVNMergeResult in org.tmatesoft.svn.core.internal.wc17
Methods in org.tmatesoft.svn.core.internal.wc17 that return SVNMergeResult Modifier and Type Method Description SVNMergeResult
DefaultSvnMerger. mergeProperties(java.lang.String localPath, SVNProperties workingProperties, SVNProperties baseProperties, SVNProperties serverBaseProps, SVNProperties propDiff, SVNAdminArea adminArea, SVNLog log, boolean baseMerge, boolean dryRun)
SVNMergeResult
DefaultSvnMerger. mergeText(SVNMergeFileSet files, boolean dryRun, SVNDiffOptions options)
-
Uses of SVNMergeResult in org.tmatesoft.svn.core.wc
Methods in org.tmatesoft.svn.core.wc that return SVNMergeResult Modifier and Type Method Description static SVNMergeResult
SVNMergeResult. createMergeResult(SVNStatusType status, SVNConflictReason reason)
Creates a new merge result object.SVNMergeResult
ISVNMerger. mergeProperties(java.lang.String localPath, SVNProperties workingProperties, SVNProperties baseProperties, SVNProperties serverBaseProps, SVNProperties propDiff, SVNAdminArea adminArea, SVNLog log, boolean baseMerge, boolean dryRun)
GivenadminArea
/localPath
and property changes (propDiff
) based onserverBaseProps
, merges the changes into the working copy.SVNMergeResult
ISVNMerger. mergeText(SVNMergeFileSet files, boolean dryRun, SVNDiffOptions options)
Performs a text merge.
-