Uses of Class
org.tmatesoft.svn.core.wc.SVNConflictAction
Packages that use SVNConflictAction
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.
-
Uses of SVNConflictAction in org.tigris.subversion.javahl
Methods in org.tigris.subversion.javahl with parameters of type SVNConflictActionModifier and TypeMethodDescriptionstatic 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 SVNConflictActionMethods in org.tmatesoft.svn.core.internal.wc with parameters of type SVNConflictActionModifier and TypeMethodDescriptionprivate SVNTreeConflictDescription
SVNUpdateEditor.checkTreeConflict
(File path, SVNEntry entry, SVNAdminArea parentArea, SVNLog log, SVNConflictAction action, SVNNodeKind theirKind, SVNURL theirURL) protected SVNTreeConflictDescription
SVNMergeDriver.makeTreeConflict
(File victim, SVNNodeKind kind, SVNConflictAction action, SVNConflictReason reason) protected void
SVNMergeDriver.recordTreeConflict
(File victim, SVNAdminArea adminArea, SVNNodeKind kind, SVNConflictAction action, SVNConflictReason reason) protected void
SVNMergeDriver.recordTreeConflictOnAdd
(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 SVNConflictActionMethods in org.tmatesoft.svn.core.internal.wc17 that return SVNConflictActionMethods in org.tmatesoft.svn.core.internal.wc17 with parameters of type SVNConflictActionModifier and TypeMethodDescriptionprivate boolean
SVNTreeConflictEditor.checkTreeConflict
(File localRelPath, SVNNodeKind oldKind, SVNNodeKind newKind, File oldReposRelPath, SVNConflictAction action) private SVNSkel
SVNUpdateEditor17.checkTreeConflict
(File localAbspath, ISVNWCDb.SVNWCDbStatus workingStatus, boolean existsInRepos, SVNNodeKind expectedKind, SVNConflictAction action) private SVNTreeConflictDescription
SVNUpdateEditor17.createTreeConflict
(File localAbspath, SVNConflictReason reason, SVNConflictAction action, SVNNodeKind theirNodeKind, File theirRelpath) private void
SVNTreeConflictEditor.markTreeConflict
(File localRelPath, SVNConflictVersion oldVersion, SVNConflictVersion newVersion, File moveRootDstRelPath, SVNOperation operation, SVNNodeKind oldKind, SVNNodeKind newKind, File oldReposRelPath, SVNConflictReason reason, SVNConflictAction action, File moveSrcOpRootRelPath) void
SVNWCConflictDescription17.setAction
(SVNConflictAction action) private SVNConflictDescription
SVNWCContext.setupTreeConflictDesc
(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 SVNConflictActionModifier and TypeFieldDescriptionSVNWCDb.ResolveDeleteRaiseMovedAway.action
SVNWCDb.UpdateMovedAwayConflictVictim.incomingChange
Methods in org.tmatesoft.svn.core.internal.wc17.db with parameters of type SVNConflictActionModifier and TypeMethodDescriptionstatic void
SvnWcDbConflicts.addTreeConflict
(SVNSkel skel, ISVNWCDb db, File wriAbsPath, SVNConflictReason localChange, SVNConflictAction incomingChange, File moveSrcOpRootAbsPath) private static void
SvnWcDbConflicts.addTreeConflict
(SVNSkel skel, SVNConflictReason localChange, SVNConflictAction incomingChange) private void
SVNWCDb.driveTreeConflictEditor
(SVNTreeConflictEditor treeConflictEditor, File srcRelPath, File dstRelPath, int srcOpDepth, SVNOperation operation, SVNConflictReason localChange, SVNConflictAction incomingChange, SVNConflictVersion oldVersion, SVNConflictVersion newVersion, SVNWCDbRoot wcRoot) private void
SVNWCDb.markTreeConflict
(File localRelPath, SVNWCDbRoot wcRoot, SVNConflictVersion oldVersion, SVNConflictVersion newVersion, File moveRootDstRelPath, SVNOperation operation, SVNNodeKind oldKind, SVNNodeKind newKind, File oldReposRelPath, SVNConflictReason reason, SVNConflictAction action, File moveSrcOpRootRelPath) -
Uses of SVNConflictAction in org.tmatesoft.svn.core.internal.wc2.ng
Fields in org.tmatesoft.svn.core.internal.wc2.ng declared as SVNConflictActionModifier and TypeFieldDescriptionprivate SVNConflictAction
SvnNgMergeCallback2.DirectoryBaton.treeConflictAction
private SVNConflictAction
SvnNgMergeCallback2.FileBaton.treeConflictAction
Methods in org.tmatesoft.svn.core.internal.wc2.ng with parameters of type SVNConflictActionModifier and TypeMethodDescriptionprivate SVNTreeConflictDescription
SvnNgMergeCallback.makeTreeConflict
(File path, SVNNodeKind kind, SVNConflictAction action, SVNConflictReason reason) private void
SvnNgMergeCallback2.recordTreeConflict
(File localAbsPath, SvnNgMergeCallback2.DirectoryBaton parentBaton, SVNNodeKind nodeKind, SVNConflictAction action, SVNConflictReason reason, SVNWCConflictDescription17 existingConflict, boolean notifyTreeConflict) private void
SvnNgMergeCallback.treeConflict
(File path, SVNNodeKind kind, SVNConflictAction action, SVNConflictReason reason) private void
SvnNgMergeCallback.treeConflictOnAdd
(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 SVNConflictActionModifier and TypeMethodDescriptionprivate ConflictDescriptor.Action
SVNClientImpl.getConflictDescriptorAction
(SVNConflictAction conflictAction) -
Uses of SVNConflictAction in org.tmatesoft.svn.core.wc
Fields in org.tmatesoft.svn.core.wc declared as SVNConflictActionModifier and TypeFieldDescriptionstatic 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 SVNConflictActionModifier and TypeMethodDescriptionstatic SVNConflictAction
SVNConflictAction.fromString
(String action) Converts string to anSVNConflictAction
object when possible.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 SVNConflictActionModifier and TypeMethodDescriptionvoid
SVNConflictDescription.setConflictAction
(SVNConflictAction action) Constructors in org.tmatesoft.svn.core.wc with parameters of type SVNConflictActionModifierConstructorDescriptionSVNConflictDescription
(SVNMergeFileSet mergeFiles, SVNNodeKind nodeKind, SVNConflictAction conflictAction, SVNConflictReason conflictReason) Creates a newSVNConflictDescription
object.SVNPropertyConflictDescription
(SVNMergeFileSet mergeFiles, SVNNodeKind nodeKind, String propertyName, SVNConflictAction conflictAction, SVNConflictReason conflictReason) Creates a newSVNPropertyConflictDescription
object.SVNTextConflictDescription
(SVNMergeFileSet mergeFiles, SVNNodeKind nodeKind, SVNConflictAction conflictAction, SVNConflictReason conflictReason) Creates a newSVNTextConflictDescription
object.SVNTreeConflictDescription
(File path, SVNNodeKind nodeKind, SVNConflictAction conflictAction, SVNConflictReason conflictReason, SVNOperation operation, SVNConflictVersion sourceLeftVersion, SVNConflictVersion sourceRightVersion) Creates a newSVNTreeConflictDescription
.