Uses of Class
org.tmatesoft.svn.core.wc.SVNConflictChoice
Packages that use SVNConflictChoice
Package
Description
Provides a (mostly native, using JNI and javah) implementation of
a high level Java API for
Subversion.
This package provides a high-level API for managing Working Copies in a way
compatible with the native SVN command line client.
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 SVNConflictChoice in org.tigris.subversion.javahl
Methods in org.tigris.subversion.javahl that return SVNConflictChoiceModifier and TypeMethodDescriptionstatic SVNConflictChoice
JavaHLObjectFactory.getSVNConflictChoice
(int conflictResult) -
Uses of SVNConflictChoice in org.tmatesoft.svn.core.internal.wc.admin
Methods in org.tmatesoft.svn.core.internal.wc.admin with parameters of type SVNConflictChoiceModifier and TypeMethodDescriptionboolean
SVNAdminArea.markResolved
(String name, boolean text, boolean props, SVNConflictChoice conflictChoice) -
Uses of SVNConflictChoice in org.tmatesoft.svn.core.internal.wc16
Methods in org.tmatesoft.svn.core.internal.wc16 with parameters of type SVNConflictChoiceModifier and TypeMethodDescriptionvoid
SVNWCClient16.doResolve
(File path, SVNDepth depth, boolean resolveContents, boolean resolveProperties, boolean resolveTree, SVNConflictChoice conflictChoice) Performs automatic conflict resolution on a working copypath
.void
SVNWCClient16.doResolve
(File path, SVNDepth depth, boolean resolveContents, boolean resolveProperties, SVNConflictChoice conflictChoice) Performs automatic conflict resolution on a working copypath
.void
SVNWCClient16.doResolve
(File path, SVNDepth depth, SVNConflictChoice conflictChoice) Performs automatic conflict resolution on a working copypath
. -
Uses of SVNConflictChoice in org.tmatesoft.svn.core.internal.wc17
Fields in org.tmatesoft.svn.core.internal.wc17 declared as SVNConflictChoiceMethods in org.tmatesoft.svn.core.internal.wc17 with parameters of type SVNConflictChoiceModifier and TypeMethodDescriptionprivate SVNWCContext.MergeInfo
SVNWCContext.evalConflictResolverResult
(SVNConflictChoice choice, File wriAbspath, File leftAbspath, File rightAbspath, File targetAbspath, File copyfromText, File mergedFile, File detranslatedTarget, SVNDiffOptions options) SVNWCContext.evalTextConflictFuncResult
(File localAbsPath, SVNConflictChoice choice, File leftAbsPath, File rightAbsPath, File mergedAbsPath, File detranslatedTarget) private void
SVNWCContext.recursiveResolveConflict
(File localAbsPath, SVNDepth depth, boolean resolveText, String resolveProps, boolean resolveTree, SVNConflictChoice conflictChoice, ISVNConflictHandler conflictHandler) boolean
SVNWCContext.resolveConflictOnNode
(File localAbsPath, boolean resolveText, boolean resolveProps, SVNConflictChoice conflictChoice) void
SVNWCContext.resolvedConflict
(File localAbsPath, SVNDepth depth, boolean resolveText, String resolveProps, boolean resolveTree, SVNConflictChoice conflictChoice) private void
SVNWCContext.resolveOneConflict
(File localAbsPath, boolean resolveText, String resolveProps, boolean resolveTree, SVNConflictChoice conflictChoice) private boolean
SVNWCContext.resolvePropConflictOnNode
(File localAbsPath, String conflictedPropName, SVNConflictChoice conflictChoice, File mergedFile) private boolean
SVNWCContext.resolveTextConflictOnNode
(File localAbsPath, SVNConflictChoice conflictChoice, File mergedFile) private boolean
SVNWCContext.resolveTreeConflictOnNode
(File localAbsPath, SVNConflictChoice conflictChoice) -
Uses of SVNConflictChoice in org.tmatesoft.svn.core.javahl17
Methods in org.tmatesoft.svn.core.javahl17 that return SVNConflictChoiceModifier and TypeMethodDescriptionprivate SVNConflictChoice
SVNClientImpl.getSVNConflictChoice
(ConflictResult.Choice choice) -
Uses of SVNConflictChoice in org.tmatesoft.svn.core.wc
Fields in org.tmatesoft.svn.core.wc declared as SVNConflictChoiceModifier and TypeFieldDescriptionstatic SVNConflictChoice
SVNConflictChoice.BASE
Constant saying to choose the base version of the file to resolve the conflict here and now.static SVNConflictChoice
SVNConflictChoice.MERGED
Constant saying to choose the merged version of the file to resolve the conflict here and now.static SVNConflictChoice
SVNConflictChoice.MINE_CONFLICT
Constant saying to choose the own (for conflicted hunks) version of the file to resolve the conflict here and now.static SVNConflictChoice
SVNConflictChoice.MINE_FULL
Constant saying to choose the own version of the file to resolve the conflict here and now.private SVNConflictChoice
SVNConflictResult.myConflictChoice
static SVNConflictChoice
SVNConflictChoice.POSTPONE
Constant saying: don't resolve the conflict now.static SVNConflictChoice
SVNConflictChoice.THEIRS_CONFLICT
Constant saying to choose the incoming (for conflicted hunks) version of the file to resolve the conflict here and now.static SVNConflictChoice
SVNConflictChoice.THEIRS_FULL
Constant saying to choose the incoming version of the file to resolve the conflict here and now.Methods in org.tmatesoft.svn.core.wc that return SVNConflictChoiceModifier and TypeMethodDescriptionSVNConflictResult.getConflictChoice()
Returns the conflict handler's choice.Methods in org.tmatesoft.svn.core.wc with parameters of type SVNConflictChoiceModifier and TypeMethodDescriptionvoid
SVNWCClient.doResolve
(File path, SVNDepth depth, boolean resolveContents, boolean resolveProperties, boolean resolveTree, SVNConflictChoice conflictChoice) Performs automatic conflict resolution on a working copypath
.void
SVNWCClient.doResolve
(File path, SVNDepth depth, boolean resolveContents, boolean resolveProperties, SVNConflictChoice conflictChoice) Performs automatic conflict resolution on a working copypath
.void
SVNWCClient.doResolve
(File path, SVNDepth depth, SVNConflictChoice conflictChoice) Performs automatic conflict resolution on a working copypath
.Constructors in org.tmatesoft.svn.core.wc with parameters of type SVNConflictChoiceModifierConstructorDescriptionSVNConflictResult
(SVNConflictChoice conflictChoice, File mergedFile) Creates a newSVNConflictChoice
object.SVNConflictResult
(SVNConflictChoice conflictChoice, File mergedFile, boolean saveMerged) Creates a newSVNConflictChoice
object. -
Uses of SVNConflictChoice in org.tmatesoft.svn.core.wc2
Fields in org.tmatesoft.svn.core.wc2 declared as SVNConflictChoiceMethods in org.tmatesoft.svn.core.wc2 that return SVNConflictChoiceModifier and TypeMethodDescriptionSvnResolve.getConflictChoice()
Gets kind of choice object for making decision while resolving.Methods in org.tmatesoft.svn.core.wc2 with parameters of type SVNConflictChoiceModifier and TypeMethodDescriptionvoid
SvnResolve.setConflictChoice
(SVNConflictChoice conflictChoice) Sets kind of choice object for making decision while resolving.