Uses of Class
org.tmatesoft.svn.core.wc.SVNConflictAction

Packages that use SVNConflictAction

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
org.tmatesoft.svn.core.internal.wc17
org.tmatesoft.svn.core.internal.wc17.db
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 SVNConflictAction in org.tigris.subversion.javahl

Methods in org.tigris.subversion.javahl with parameters of type SVNConflictAction

Modifier and Type	Method	Description
static int	JavaHLObjectFactory.getConflictAction(SVNConflictAction conflictAction)

Uses of SVNConflictAction in org.tmatesoft.svn.core.internal.wc

Methods in org.tmatesoft.svn.core.internal.wc with parameters of type SVNConflictAction

Modifier and Type	Method	Description
protected SVNTreeConflictDescription	SVNMergeDriver.makeTreeConflict(java.io.File victim, SVNNodeKind kind, SVNConflictAction action, SVNConflictReason reason)
protected void	SVNMergeDriver.recordTreeConflict(java.io.File victim, SVNAdminArea adminArea, SVNNodeKind kind, SVNConflictAction action, SVNConflictReason reason)
protected void	SVNMergeDriver.recordTreeConflictOnAdd(java.io.File victim, SVNAdminArea adminArea, SVNNodeKind kind, SVNConflictAction action, SVNConflictReason reason)

Uses of SVNConflictAction in org.tmatesoft.svn.core.internal.wc17

Methods in org.tmatesoft.svn.core.internal.wc17 that return SVNConflictAction

Modifier and Type	Method	Description
SVNConflictAction	SVNWCConflictDescription17.getAction()

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

Modifier and Type	Method	Description
void	SVNWCConflictDescription17.setAction(SVNConflictAction action)

Uses of SVNConflictAction in org.tmatesoft.svn.core.internal.wc17.db

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

Modifier and Type	Method	Description
static void	SvnWcDbConflicts.addTreeConflict(SVNSkel skel, ISVNWCDb db, java.io.File wriAbsPath, SVNConflictReason localChange, SVNConflictAction incomingChange, java.io.File moveSrcOpRootAbsPath)

Uses of SVNConflictAction in org.tmatesoft.svn.core.wc

Fields in org.tmatesoft.svn.core.wc declared as SVNConflictAction

Modifier and Type	Field	Description
static SVNConflictAction	SVNConflictAction.ADD	Constant representing an attempt to add an object.
static SVNConflictAction	SVNConflictAction.DELETE	Constant representing an attempt to delete an object.
static SVNConflictAction	SVNConflictAction.EDIT	Constant representing an attempt to change text or props.
static SVNConflictAction	SVNConflictAction.REPLACE	Constant representing an attempt to replace an object.

Methods in org.tmatesoft.svn.core.wc that return SVNConflictAction

Modifier and Type	Method	Description
static SVNConflictAction	SVNConflictAction.fromString(java.lang.String action)	Converts string to an SVNConflictAction object when possible.
SVNConflictAction	SVNConflictDescription.getConflictAction()	Returns the action which attempted on an object and which lead to the conflict.

Methods in org.tmatesoft.svn.core.wc with parameters of type SVNConflictAction

Modifier and Type	Method	Description
void	SVNConflictDescription.setConflictAction(SVNConflictAction action)

Constructors in org.tmatesoft.svn.core.wc with parameters of type SVNConflictAction

Constructor	Description
SVNConflictDescription(SVNMergeFileSet mergeFiles, SVNNodeKind nodeKind, SVNConflictAction conflictAction, SVNConflictReason conflictReason)	Creates a new SVNConflictDescription object.
SVNPropertyConflictDescription(SVNMergeFileSet mergeFiles, SVNNodeKind nodeKind, java.lang.String propertyName, SVNConflictAction conflictAction, SVNConflictReason conflictReason)	Creates a new SVNPropertyConflictDescription object.
SVNTextConflictDescription(SVNMergeFileSet mergeFiles, SVNNodeKind nodeKind, SVNConflictAction conflictAction, SVNConflictReason conflictReason)	Creates a new SVNTextConflictDescription object.
SVNTreeConflictDescription(java.io.File path, SVNNodeKind nodeKind, SVNConflictAction conflictAction, SVNConflictReason conflictReason, SVNOperation operation, SVNConflictVersion sourceLeftVersion, SVNConflictVersion sourceRightVersion)	Creates a new SVNTreeConflictDescription.