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

Packages that use SVNConflictReason

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 SVNConflictReason in org.tigris.subversion.javahl

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

Modifier and Type	Method	Description
static int	JavaHLObjectFactory.getConflictReason(SVNConflictReason conflictReason)

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

Methods in org.tmatesoft.svn.core.internal.wc that return SVNConflictReason

Modifier and Type	Method	Description
private static SVNConflictReason	SVNTreeConflictUtil.getConflictReason(java.lang.String name)

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

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 SVNConflictReason in org.tmatesoft.svn.core.internal.wc17

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

Modifier and Type	Field	Description
private SVNConflictReason	SVNWCConflictDescription17.reason

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

Modifier and Type	Method	Description
SVNConflictReason	SVNWCConflictDescription17.getReason()

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

Modifier and Type	Method	Description
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.setReason(SVNConflictReason reason)
private SVNConflictDescription	SVNWCContext.setupTreeConflictDesc(java.io.File localAbsPath, SVNOperation operation, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, SVNConflictReason localChange, SVNConflictAction incomingChange)

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

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

Modifier and Type	Field	Description
SVNConflictReason	SVNWCDb.UpdateMovedAwayConflictVictim.localChange

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

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 SVNConflictReason in org.tmatesoft.svn.core.internal.wc2.ng

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

Modifier and Type	Field	Description
private SVNConflictReason	SvnNgMergeCallback2.DirectoryBaton.treeConflictReason
private SVNConflictReason	SvnNgMergeCallback2.FileBaton.treeConflictReason

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

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 SVNConflictReason in org.tmatesoft.svn.core.javahl17

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

Modifier and Type	Method	Description
private ConflictDescriptor.Reason	SVNClientImpl.getConflictDescriptorReason(SVNConflictReason conflictReason)

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

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

Modifier and Type	Field	Description
static final SVNConflictReason	SVNConflictReason.ADDED	Constant saying that an object is already added or schedule-add
static final SVNConflictReason	SVNConflictReason.DELETED	Constant saying that an object is already schedule-delete.
static final SVNConflictReason	SVNConflictReason.EDITED	Constant saying that local edits are already present.
static final SVNConflictReason	SVNConflictReason.MISSING	Constant saying that an object is unknown or missing.
static final SVNConflictReason	SVNConflictReason.MOVED_AWAY	Constant saying that an object has been moved away
static final SVNConflictReason	SVNConflictReason.MOVED_HERE	Constant saying that an object has been moved here
private SVNConflictReason	SVNConflictDescription.myConflictReason
private SVNConflictReason	SVNMergeResult.myConflictReason
static final SVNConflictReason	SVNConflictReason.OBSTRUCTED	Constant saying that another object is in the way.
static final SVNConflictReason	SVNConflictReason.REPLACED	Constant saying that an object is already replaced.
static final SVNConflictReason	SVNConflictReason.SKIP
static final SVNConflictReason	SVNConflictReason.UNVERSIONED	Constant saying that an object is unversioned.
static final SVNConflictReason	SVNConflictReason.WC_SKIP

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

Modifier and Type	Method	Description
static SVNConflictReason	SVNConflictReason.fromString(java.lang.String reason)	Converts a string reason name to an SVNConflictReason object.
SVNConflictReason	SVNConflictDescription.getConflictReason()	Returns the reason why the conflict occurred.
SVNConflictReason	SVNMergeResult.getConflictReason()	Returns conflict reason.

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

Modifier and Type	Method	Description
static SVNMergeResult	SVNMergeResult.createMergeResult(SVNStatusType status, SVNConflictReason reason)	Creates a new merge result object.

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

Modifier	Constructor	Description
	SVNConflictDescription(SVNMergeFileSet mergeFiles, SVNNodeKind nodeKind, SVNConflictAction conflictAction, SVNConflictReason conflictReason)	Creates a new SVNConflictDescription object.
private	SVNMergeResult(SVNStatusType status, SVNConflictReason conflictReason)
	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.