Uses of Class
org.tigris.subversion.javahl.ConflictDescriptor
Packages that use ConflictDescriptor
Package
Description
Provides a (mostly native, using JNI and javah) implementation of
a high level Java API for
Subversion.
-
Uses of ConflictDescriptor in org.tigris.subversion.javahl
Fields in org.tigris.subversion.javahl declared as ConflictDescriptorModifier and TypeFieldDescriptionprivate ConflictDescriptor
Status.conflictDescriptor
private ConflictDescriptor
Info2.treeConflict
Info on any tree conflict of which this node is a victim.Methods in org.tigris.subversion.javahl that return ConflictDescriptorModifier and TypeMethodDescriptionstatic ConflictDescriptor
JavaHLObjectFactory.createConflictDescription
(SVNConflictDescription conflictDescription) Info2.getConflictDescriptor()
Status.getConflictDescriptor()
private static ConflictDescriptor
Info2.getTreeConflict
(Set<ConflictDescriptor> conflicts) Methods in org.tigris.subversion.javahl with parameters of type ConflictDescriptorModifier and TypeMethodDescriptionConflictResolverCallback.resolve
(ConflictDescriptor descrip) The callback method invoked for each conflict during a merge/update/switch operation.Constructors in org.tigris.subversion.javahl with parameters of type ConflictDescriptorModifierConstructorDescription(package private)
Info2
(String path, String url, long rev, int kind, String reposRootUrl, String reposUUID, long lastChangedRev, long lastChangedDate, String lastChangedAuthor, Lock lock, boolean hasWcInfo, int schedule, String copyFromUrl, long copyFromRev, long textTime, long propTime, String checksum, String conflictOld, String conflictNew, String conflictWrk, String prejfile, String changelistName, long workingSize, long reposSize, int depth, ConflictDescriptor treeConflict) constructor to build the object by native code.Status
(String path, String url, int nodeKind, long revision, long lastChangedRevision, long lastChangedDate, String lastCommitAuthor, int textStatus, int propStatus, int repositoryTextStatus, int repositoryPropStatus, boolean locked, boolean copied, boolean treeConflicted, ConflictDescriptor conflictDescriptor, String conflictOld, String conflictNew, String conflictWorking, String urlCopiedFrom, long revisionCopiedFrom, boolean switched, boolean fileExternal, String lockToken, String lockOwner, String lockComment, long lockCreationDate, Lock reposLock, long reposLastCmtRevision, long reposLastCmtDate, int reposKind, String reposLastCmtAuthor, String changelist) this constructor should only called from JNI code