Uses of Class
org.tmatesoft.svn.core.wc.SVNConflictDescription
-
Packages that use SVNConflictDescription 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.cli.svn 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.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 SVNConflictDescription in org.tigris.subversion.javahl
Methods in org.tigris.subversion.javahl with parameters of type SVNConflictDescription Modifier and Type Method Description static ConflictDescriptor
JavaHLObjectFactory. createConflictDescription(SVNConflictDescription conflictDescription)
-
Uses of SVNConflictDescription in org.tmatesoft.svn.cli.svn
Methods in org.tmatesoft.svn.cli.svn with parameters of type SVNConflictDescription Modifier and Type Method Description SVNConflictResult
SVNCommandLineConflictHandler. handleConflict(SVNConflictDescription conflictDescription)
SVNConflictResult
SVNCommandLineConflictHandler. handleConflictNoStats(SVNConflictDescription conflictDescription)
-
Uses of SVNConflictDescription in org.tmatesoft.svn.core.internal.wc17
Methods in org.tmatesoft.svn.core.internal.wc17 that return SVNConflictDescription Modifier and Type Method Description private SVNConflictDescription
SVNWCContext. setupTextConflictDesc(java.io.File leftAbspath, java.io.File rightAbspath, java.io.File targetAbspath, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, java.io.File resultTarget, java.io.File detranslatedTarget, SVNPropertyValue mimeprop, boolean isBinary)
private SVNConflictDescription
SVNWCContext. setupTreeConflictDesc(java.io.File localAbsPath, SVNOperation operation, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, SVNConflictReason localChange, SVNConflictAction incomingChange)
SVNConflictDescription
SVNWCConflictDescription17. toConflictDescription()
-
Uses of SVNConflictDescription in org.tmatesoft.svn.core.internal.wc17.db
Methods in org.tmatesoft.svn.core.internal.wc17.db that return types with arguments of type SVNConflictDescription Modifier and Type Method Description java.util.List<SVNConflictDescription>
ISVNWCDb. readConflicts(java.io.File localAbsPath)
Return all conflicts that have LOCAL_ABSPATH as victim.java.util.List<SVNConflictDescription>
SVNWCDb. readConflicts(java.io.File localAbsPath)
-
Uses of SVNConflictDescription in org.tmatesoft.svn.core.internal.wc2.ng
Fields in org.tmatesoft.svn.core.internal.wc2.ng with type parameters of type SVNConflictDescription Modifier and Type Field Description private java.util.List<SVNConflictDescription>
SvnNgAbstractUpdate.RecordConflictsResolver. conflicts
Methods in org.tmatesoft.svn.core.internal.wc2.ng that return types with arguments of type SVNConflictDescription Modifier and Type Method Description private java.util.List<SVNConflictDescription>
SvnNgAbstractUpdate.RecordConflictsResolver. getConflicts()
Methods in org.tmatesoft.svn.core.internal.wc2.ng with parameters of type SVNConflictDescription Modifier and Type Method Description SVNConflictResult
SvnNgAbstractUpdate.RecordConflictsResolver. handleConflict(SVNConflictDescription conflictDescription)
-
Uses of SVNConflictDescription in org.tmatesoft.svn.core.javahl17
Methods in org.tmatesoft.svn.core.javahl17 with parameters of type SVNConflictDescription Modifier and Type Method Description private ConflictDescriptor
SVNClientImpl. getConflictDescription(SVNConflictDescription conflictDescription)
private ConflictDescriptor.Kind
SVNClientImpl. getConflictDescriptorKind(SVNConflictDescription conflictDescription)
Method parameters in org.tmatesoft.svn.core.javahl17 with type arguments of type SVNConflictDescription Modifier and Type Method Description private java.util.Set<ConflictDescriptor>
SVNClientImpl. getConflictDescriptors(java.util.Collection<SVNConflictDescription> conflicts)
-
Uses of SVNConflictDescription in org.tmatesoft.svn.core.wc
Subclasses of SVNConflictDescription in org.tmatesoft.svn.core.wc Modifier and Type Class Description class
SVNPropertyConflictDescription
SVNPropertyConflictDescription brings a property conflict description.class
SVNTextConflictDescription
SVNTextConflictDescription brings information about conflict on a file.class
SVNTreeConflictDescription
SVNTreeConflictDescription brings information on a tree conflict.Methods in org.tmatesoft.svn.core.wc with parameters of type SVNConflictDescription Modifier and Type Method Description SVNConflictResult
ISVNConflictHandler. handleConflict(SVNConflictDescription conflictDescription)
Handles the conflict given the conflict descriptionconflictDescription
and returns -
Uses of SVNConflictDescription in org.tmatesoft.svn.core.wc2
Fields in org.tmatesoft.svn.core.wc2 with type parameters of type SVNConflictDescription Modifier and Type Field Description private java.util.Collection<SVNConflictDescription>
SvnWorkingCopyInfo. conflicts
Methods in org.tmatesoft.svn.core.wc2 that return types with arguments of type SVNConflictDescription Modifier and Type Method Description java.util.Collection<SVNConflictDescription>
SvnWorkingCopyInfo. getConflicts()
Returns all item's conflicts.Method parameters in org.tmatesoft.svn.core.wc2 with type arguments of type SVNConflictDescription Modifier and Type Method Description void
SvnWorkingCopyInfo. setConflicts(java.util.Collection<SVNConflictDescription> conflicts)
Sets the item's conflicts.
-