Uses of Class
org.tmatesoft.svn.core.wc.SVNConflictChoice
-
Packages that use SVNConflictChoice Package Description org.tigris.subversion.javahl Provides a (mostly native, using JNI and javah) implementation of a high level Java API for Subversion.org.tmatesoft.svn.core.internal.wc.admin org.tmatesoft.svn.core.internal.wc16 org.tmatesoft.svn.core.internal.wc17 org.tmatesoft.svn.core.javahl17 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.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 SVNConflictChoice in org.tigris.subversion.javahl
Methods in org.tigris.subversion.javahl that return SVNConflictChoice Modifier and Type Method Description static 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 SVNConflictChoice Modifier and Type Method Description boolean
SVNAdminArea. markResolved(java.lang.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 SVNConflictChoice Modifier and Type Method Description void
SVNWCClient16. doResolve(java.io.File path, SVNDepth depth, boolean resolveContents, boolean resolveProperties, boolean resolveTree, SVNConflictChoice conflictChoice)
Performs automatic conflict resolution on a working copypath
.void
SVNWCClient16. doResolve(java.io.File path, SVNDepth depth, boolean resolveContents, boolean resolveProperties, SVNConflictChoice conflictChoice)
Performs automatic conflict resolution on a working copypath
.void
SVNWCClient16. doResolve(java.io.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 SVNConflictChoice Modifier and Type Field Description SVNConflictChoice
SVNWCContext.ConflictStatusWalker. conflictChoice
Methods in org.tmatesoft.svn.core.internal.wc17 with parameters of type SVNConflictChoice Modifier and Type Method Description private SVNWCContext.MergeInfo
SVNWCContext. evalConflictResolverResult(SVNConflictChoice choice, java.io.File wriAbspath, java.io.File leftAbspath, java.io.File rightAbspath, java.io.File targetAbspath, java.io.File copyfromText, java.io.File mergedFile, java.io.File detranslatedTarget, SVNDiffOptions options)
private SVNWCContext.TextConflictResolutionInfo
SVNWCContext. evalTextConflictFuncResult(java.io.File localAbsPath, SVNConflictChoice choice, java.io.File leftAbsPath, java.io.File rightAbsPath, java.io.File mergedAbsPath, java.io.File detranslatedTarget)
private void
SVNWCContext. recursiveResolveConflict(java.io.File localAbsPath, SVNDepth depth, boolean resolveText, java.lang.String resolveProps, boolean resolveTree, SVNConflictChoice conflictChoice, ISVNConflictHandler conflictHandler)
boolean
SVNWCContext. resolveConflictOnNode(java.io.File localAbsPath, boolean resolveText, boolean resolveProps, SVNConflictChoice conflictChoice)
void
SVNWCContext. resolvedConflict(java.io.File localAbsPath, SVNDepth depth, boolean resolveText, java.lang.String resolveProps, boolean resolveTree, SVNConflictChoice conflictChoice)
private void
SVNWCContext. resolveOneConflict(java.io.File localAbsPath, boolean resolveText, java.lang.String resolveProps, boolean resolveTree, SVNConflictChoice conflictChoice)
private boolean
SVNWCContext. resolvePropConflictOnNode(java.io.File localAbsPath, java.lang.String conflictedPropName, SVNConflictChoice conflictChoice, java.io.File mergedFile)
private boolean
SVNWCContext. resolveTextConflictOnNode(java.io.File localAbsPath, SVNConflictChoice conflictChoice, java.io.File mergedFile)
private boolean
SVNWCContext. resolveTreeConflictOnNode(java.io.File localAbsPath, SVNConflictChoice conflictChoice)
-
Uses of SVNConflictChoice in org.tmatesoft.svn.core.javahl17
Methods in org.tmatesoft.svn.core.javahl17 that return SVNConflictChoice Modifier and Type Method Description private SVNConflictChoice
SVNClientImpl. getSVNConflictChoice(ConflictResult.Choice choice)
-
Uses of SVNConflictChoice in org.tmatesoft.svn.core.wc
Fields in org.tmatesoft.svn.core.wc declared as SVNConflictChoice Modifier and Type Field Description static 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 SVNConflictChoice Modifier and Type Method Description SVNConflictChoice
SVNConflictResult. getConflictChoice()
Returns the conflict handler's choice.Methods in org.tmatesoft.svn.core.wc with parameters of type SVNConflictChoice Modifier and Type Method Description void
SVNWCClient. doResolve(java.io.File path, SVNDepth depth, boolean resolveContents, boolean resolveProperties, boolean resolveTree, SVNConflictChoice conflictChoice)
Performs automatic conflict resolution on a working copypath
.void
SVNWCClient. doResolve(java.io.File path, SVNDepth depth, boolean resolveContents, boolean resolveProperties, SVNConflictChoice conflictChoice)
Performs automatic conflict resolution on a working copypath
.void
SVNWCClient. doResolve(java.io.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 SVNConflictChoice Constructor Description SVNConflictResult(SVNConflictChoice conflictChoice, java.io.File mergedFile)
Creates a newSVNConflictChoice
object.SVNConflictResult(SVNConflictChoice conflictChoice, java.io.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 SVNConflictChoice Modifier and Type Field Description private SVNConflictChoice
SvnResolve. conflictChoice
Methods in org.tmatesoft.svn.core.wc2 that return SVNConflictChoice Modifier and Type Method Description SVNConflictChoice
SvnResolve. getConflictChoice()
Gets kind of choice object for making decision while resolving.Methods in org.tmatesoft.svn.core.wc2 with parameters of type SVNConflictChoice Modifier and Type Method Description void
SvnResolve. setConflictChoice(SVNConflictChoice conflictChoice)
Sets kind of choice object for making decision while resolving.
-