Uses of Class
org.tmatesoft.svn.core.wc.SVNTreeConflictDescription
-
Packages that use SVNTreeConflictDescription Package Description org.tmatesoft.svn.core.internal.wc org.tmatesoft.svn.core.internal.wc.admin org.tmatesoft.svn.core.internal.wc17 org.tmatesoft.svn.core.internal.wc17.db org.tmatesoft.svn.core.internal.wc2.ng 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 SVNTreeConflictDescription in org.tmatesoft.svn.core.internal.wc
Methods in org.tmatesoft.svn.core.internal.wc that return SVNTreeConflictDescription 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)
static SVNTreeConflictDescription
SVNTreeConflictUtil. readSingleTreeConflict(SVNSkel skel, java.io.File dirPath)
Methods in org.tmatesoft.svn.core.internal.wc with parameters of type SVNTreeConflictDescription Modifier and Type Method Description private static java.lang.String
SVNTreeConflictUtil. getActionString(SVNTreeConflictDescription treeConflict)
static SVNSkel
SVNTreeConflictUtil. getConflictSkel(SVNConflictVersion nullVersion, SVNTreeConflictDescription conflict)
static java.lang.String
SVNTreeConflictUtil. getHumanReadableConflictDescription(SVNTreeConflictDescription treeConflict)
private static java.lang.String
SVNTreeConflictUtil. getReasonString(SVNTreeConflictDescription treeConflict)
static java.lang.String
SVNTreeConflictUtil. getSingleTreeConflictData(SVNTreeConflictDescription conflict)
static byte[]
SVNTreeConflictUtil. getSingleTreeConflictRawData(SVNTreeConflictDescription conflict)
private SVNProperties
SVNUpdateEditor. getTreeConflictCreationAttributes(SVNAdminArea adminArea, SVNTreeConflictDescription treeConflict)
-
Uses of SVNTreeConflictDescription in org.tmatesoft.svn.core.internal.wc.admin
Methods in org.tmatesoft.svn.core.internal.wc.admin that return SVNTreeConflictDescription Modifier and Type Method Description abstract SVNTreeConflictDescription
SVNAdminArea. deleteTreeConflict(java.lang.String name)
SVNTreeConflictDescription
SVNAdminArea14. deleteTreeConflict(java.lang.String name)
SVNTreeConflictDescription
SVNAdminArea16. deleteTreeConflict(java.lang.String victimName)
SVNTreeConflictDescription
SVNXMLAdminArea. deleteTreeConflict(java.lang.String name)
abstract SVNTreeConflictDescription
SVNAdminArea. getTreeConflict(java.lang.String name)
SVNTreeConflictDescription
SVNAdminArea14. getTreeConflict(java.lang.String name)
SVNTreeConflictDescription
SVNAdminArea16. getTreeConflict(java.lang.String victimName)
SVNTreeConflictDescription
SVNWCAccess. getTreeConflict(java.io.File path)
SVNTreeConflictDescription
SVNXMLAdminArea. getTreeConflict(java.lang.String name)
Methods in org.tmatesoft.svn.core.internal.wc.admin that return types with arguments of type SVNTreeConflictDescription Modifier and Type Method Description abstract java.util.Map<java.io.File,SVNTreeConflictDescription>
SVNEntry. getTreeConflicts()
Methods in org.tmatesoft.svn.core.internal.wc.admin with parameters of type SVNTreeConflictDescription Modifier and Type Method Description abstract void
SVNAdminArea. addTreeConflict(SVNTreeConflictDescription conflict)
void
SVNAdminArea14. addTreeConflict(SVNTreeConflictDescription conflict)
void
SVNAdminArea16. addTreeConflict(SVNTreeConflictDescription conflict)
void
SVNXMLAdminArea. addTreeConflict(SVNTreeConflictDescription conflict)
-
Uses of SVNTreeConflictDescription in org.tmatesoft.svn.core.internal.wc17
Fields in org.tmatesoft.svn.core.internal.wc17 declared as SVNTreeConflictDescription Modifier and Type Field Description SVNTreeConflictDescription
SVNWCContext.ConflictInfo. treeConflict
Methods in org.tmatesoft.svn.core.internal.wc17 that return SVNTreeConflictDescription Modifier and Type Method Description private SVNTreeConflictDescription
SVNUpdateEditor17. createTreeConflict(java.io.File localAbspath, SVNConflictReason reason, SVNConflictAction action, SVNNodeKind theirNodeKind, java.io.File theirRelpath)
SVNTreeConflictDescription
SVNWCContext. getTreeConflict(java.io.File victimAbspath)
-
Uses of SVNTreeConflictDescription in org.tmatesoft.svn.core.internal.wc17.db
Fields in org.tmatesoft.svn.core.internal.wc17.db declared as SVNTreeConflictDescription Modifier and Type Field Description SVNTreeConflictDescription
SVNWCDb.SetTreeConflict. treeConflict
SVNTreeConflictDescription
SVNWCDb.TcInfo. treeConflictDescription
Methods in org.tmatesoft.svn.core.internal.wc17.db that return SVNTreeConflictDescription Modifier and Type Method Description SVNTreeConflictDescription
ISVNWCDb. opReadTreeConflict(java.io.File localAbspath)
Get any tree conflict associated with localAbspath in DB.SVNTreeConflictDescription
SVNWCDb. opReadTreeConflict(java.io.File localAbsPath)
Methods in org.tmatesoft.svn.core.internal.wc17.db that return types with arguments of type SVNTreeConflictDescription Modifier and Type Method Description java.util.Map<java.lang.String,SVNTreeConflictDescription>
ISVNWCDb. opReadAllTreeConflicts(java.io.File localAbsPath)
Return all the children of localAbsPath that are in tree conflicts.java.util.Map<java.lang.String,SVNTreeConflictDescription>
SVNWCDb. opReadAllTreeConflicts(java.io.File localAbsPath)
private java.util.Map<java.lang.String,SVNTreeConflictDescription>
SVNWCDb. readAllTreeConflicts(SVNWCDbDir pdh, java.io.File localRelpath)
private java.util.Map<java.lang.String,SVNTreeConflictDescription>
SVNWCDb. readAllTreeConflicts17(SVNWCDbDir pdh, java.io.File localRelpath)
Methods in org.tmatesoft.svn.core.internal.wc17.db with parameters of type SVNTreeConflictDescription Modifier and Type Method Description void
ISVNWCDb. opSetTreeConflict(java.io.File localAbspath, SVNTreeConflictDescription treeConflict)
Set the tree conflict on LOCAL_ABSPATH in DB to TREE_CONFLICT.void
SVNWCDb. opSetTreeConflict(java.io.File localAbspath, SVNTreeConflictDescription treeConflict)
static SVNSkel
SvnWcDbConflicts. treeConflictDescriptionToSkel(ISVNWCDb db, java.io.File wriAbsPath, SVNTreeConflictDescription conflictDescription)
-
Uses of SVNTreeConflictDescription in org.tmatesoft.svn.core.internal.wc2.ng
Fields in org.tmatesoft.svn.core.internal.wc2.ng with type parameters of type SVNTreeConflictDescription Modifier and Type Field Description private java.util.Map<java.io.File,SVNTreeConflictDescription>
SvnNgGetInfo. treeConflicts
Methods in org.tmatesoft.svn.core.internal.wc2.ng that return SVNTreeConflictDescription Modifier and Type Method Description private SVNTreeConflictDescription
SvnNgMergeCallback. makeTreeConflict(java.io.File path, SVNNodeKind kind, SVNConflictAction action, SVNConflictReason reason)
Methods in org.tmatesoft.svn.core.internal.wc2.ng that return types with arguments of type SVNTreeConflictDescription Modifier and Type Method Description private java.util.Map<java.io.File,SVNTreeConflictDescription>
SvnNgGetInfo. getTreeConflicts()
-
Uses of SVNTreeConflictDescription in org.tmatesoft.svn.core.wc
Fields in org.tmatesoft.svn.core.wc declared as SVNTreeConflictDescription Modifier and Type Field Description private SVNTreeConflictDescription
SVNInfo. myTreeConflict
private SVNTreeConflictDescription
SVNStatus. myTreeConflict
Methods in org.tmatesoft.svn.core.wc that return SVNTreeConflictDescription Modifier and Type Method Description SVNTreeConflictDescription
SVNInfo. getTreeConflict()
Returns a tree conflict description on the item represented by this object.SVNTreeConflictDescription
SVNStatus. getTreeConflict()
Returns a tree conflict description.Methods in org.tmatesoft.svn.core.wc with parameters of type SVNTreeConflictDescription Modifier and Type Method Description static SVNInfo
SVNInfo. createInfo(java.io.File file, SVNTreeConflictDescription tc)
void
SVNStatus. setTreeConflict(SVNTreeConflictDescription treeConflict)
Constructors in org.tmatesoft.svn.core.wc with parameters of type SVNTreeConflictDescription Constructor Description SVNInfo(java.io.File file, SVNURL url, SVNURL rootURL, long revision, SVNNodeKind kind, java.lang.String uuid, long committedRevision, java.lang.String committedDate, java.lang.String author, java.lang.String schedule, SVNURL copyFromURL, long copyFromRevision, java.lang.String textTime, java.lang.String propTime, java.lang.String checksum, java.lang.String conflictOld, java.lang.String conflictNew, java.lang.String conflictWorking, java.lang.String propRejectFile, SVNLock lock, SVNDepth depth, java.lang.String changelistName, long wcSize, SVNTreeConflictDescription treeConflict)
SVNStatus(SVNURL url, java.io.File file, SVNNodeKind kind, SVNRevision revision, SVNRevision committedRevision, java.util.Date committedDate, java.lang.String author, SVNStatusType contentsStatus, SVNStatusType propertiesStatus, SVNStatusType remoteContentsStatus, SVNStatusType remotePropertiesStatus, boolean isLocked, boolean isCopied, boolean isSwitched, boolean isFileExternal, java.io.File conflictNewFile, java.io.File conflictOldFile, java.io.File conflictWrkFile, java.io.File projRejectFile, java.lang.String copyFromURL, SVNRevision copyFromRevision, SVNLock remoteLock, SVNLock localLock, java.util.Map entryProperties, java.lang.String changelistName, int wcFormatVersion, SVNTreeConflictDescription treeConflict)
Constructs an SVNStatus object filling it with status information details.
-