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.internal.wc2.ng
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.

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 that return SVNConflictAction

Modifier and Type	Method	Description
private static SVNConflictAction	SVNTreeConflictUtil.getAction(java.lang.String name)

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

Modifier and Type	Method	Description
private SVNTreeConflictDescription	SVNUpdateEditor.checkTreeConflict(java.io.File path, SVNEntry entry, SVNAdminArea parentArea, SVNLog log, SVNConflictAction action, SVNNodeKind theirKind, SVNURL theirURL)
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

Fields in org.tmatesoft.svn.core.internal.wc17 declared as SVNConflictAction

Modifier and Type	Field	Description
private SVNConflictAction	SVNWCConflictDescription17.action

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
private boolean	SVNTreeConflictEditor.checkTreeConflict(java.io.File localRelPath, SVNNodeKind oldKind, SVNNodeKind newKind, java.io.File oldReposRelPath, SVNConflictAction action)
private SVNSkel	SVNUpdateEditor17.checkTreeConflict(java.io.File localAbspath, ISVNWCDb.SVNWCDbStatus workingStatus, boolean existsInRepos, SVNNodeKind expectedKind, SVNConflictAction action)
private SVNTreeConflictDescription	SVNUpdateEditor17.createTreeConflict(java.io.File localAbspath, SVNConflictReason reason, SVNConflictAction action, SVNNodeKind theirNodeKind, java.io.File theirRelpath)
private void	SVNTreeConflictEditor.markTreeConflict(java.io.File localRelPath, SVNConflictVersion oldVersion, SVNConflictVersion newVersion, java.io.File moveRootDstRelPath, SVNOperation operation, SVNNodeKind oldKind, SVNNodeKind newKind, java.io.File oldReposRelPath, SVNConflictReason reason, SVNConflictAction action, java.io.File moveSrcOpRootRelPath)
void	SVNWCConflictDescription17.setAction(SVNConflictAction action)
private SVNConflictDescription	SVNWCContext.setupTreeConflictDesc(java.io.File localAbsPath, SVNOperation operation, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, SVNConflictReason localChange, SVNConflictAction incomingChange)

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

Fields in org.tmatesoft.svn.core.internal.wc17.db declared as SVNConflictAction

Modifier and Type	Field	Description
SVNConflictAction	SVNWCDb.ResolveDeleteRaiseMovedAway.action
SVNConflictAction	SVNWCDb.UpdateMovedAwayConflictVictim.incomingChange

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)
private static void	SvnWcDbConflicts.addTreeConflict(SVNSkel skel, SVNConflictReason localChange, SVNConflictAction incomingChange)
private void	SVNWCDb.driveTreeConflictEditor(SVNTreeConflictEditor treeConflictEditor, java.io.File srcRelPath, java.io.File dstRelPath, int srcOpDepth, SVNOperation operation, SVNConflictReason localChange, SVNConflictAction incomingChange, SVNConflictVersion oldVersion, SVNConflictVersion newVersion, SVNWCDbRoot wcRoot)
private void	SVNWCDb.markTreeConflict(java.io.File localRelPath, SVNWCDbRoot wcRoot, SVNConflictVersion oldVersion, SVNConflictVersion newVersion, java.io.File moveRootDstRelPath, SVNOperation operation, SVNNodeKind oldKind, SVNNodeKind newKind, java.io.File oldReposRelPath, SVNConflictReason reason, SVNConflictAction action, java.io.File moveSrcOpRootRelPath)

Uses of SVNConflictAction in org.tmatesoft.svn.core.internal.wc2.ng

Fields in org.tmatesoft.svn.core.internal.wc2.ng declared as SVNConflictAction

Modifier and Type	Field	Description
private SVNConflictAction	SvnNgMergeCallback2.DirectoryBaton.treeConflictAction
private SVNConflictAction	SvnNgMergeCallback2.FileBaton.treeConflictAction

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

Modifier and Type	Method	Description
private SVNTreeConflictDescription	SvnNgMergeCallback.makeTreeConflict(java.io.File path, SVNNodeKind kind, SVNConflictAction action, SVNConflictReason reason)
private void	SvnNgMergeCallback2.recordTreeConflict(java.io.File localAbsPath, SvnNgMergeCallback2.DirectoryBaton parentBaton, SVNNodeKind nodeKind, SVNConflictAction action, SVNConflictReason reason, SVNWCConflictDescription17 existingConflict, boolean notifyTreeConflict)
private void	SvnNgMergeCallback.treeConflict(java.io.File path, SVNNodeKind kind, SVNConflictAction action, SVNConflictReason reason)
private void	SvnNgMergeCallback.treeConflictOnAdd(java.io.File path, SVNNodeKind kind, SVNConflictAction action, SVNConflictReason reason)

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

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

Modifier and Type	Method	Description
private ConflictDescriptor.Action	SVNClientImpl.getConflictDescriptorAction(SVNConflictAction conflictAction)

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 final SVNConflictAction	SVNConflictAction.ADD	Constant representing an attempt to add an object.
static final SVNConflictAction	SVNConflictAction.DELETE	Constant representing an attempt to delete an object.
static final SVNConflictAction	SVNConflictAction.EDIT	Constant representing an attempt to change text or props.
private SVNConflictAction	SVNConflictDescription.myConflictAction
static final 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

Modifier	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.