Package org.apache.subversion.javahl
Class ConflictDescriptor
java.lang.Object
org.apache.subversion.javahl.ConflictDescriptor
The description of a merge conflict, encountered during
merge/update/switch operations.
-
Nested Class Summary
Nested ClassesModifier and TypeClassDescriptionstatic enum
Rich man's enum forsvn_wc_conflict_action_t
.static enum
Rich man's enum forsvn_wc_conflict_kind_t
.static enum
static enum
Rich man's enum forsvn_wc_conflict_reason_t
. -
Field Summary
FieldsModifier and TypeFieldDescriptionprivate ConflictDescriptor.Action
private String
private ConflictDescriptor.Kind
private boolean
private String
private String
private String
private NodeKind
private ConflictDescriptor.Operation
private String
private String
private ConflictDescriptor.Reason
private ConflictVersion
private ConflictVersion
private String
-
Constructor Summary
ConstructorsConstructorDescriptionConflictDescriptor
(String path, ConflictDescriptor.Kind conflictKind, NodeKind nodeKind, String propertyName, boolean isBinary, String mimeType, ConflictDescriptor.Action action, ConflictDescriptor.Reason reason, ConflictDescriptor.Operation operation, String basePath, String theirPath, String myPath, String mergedPath, ConflictVersion srcLeft, ConflictVersion srcRight) This constructor should only be called from JNI code. -
Method Summary
-
Field Details
-
path
-
conflictKind
-
nodeKind
-
propertyName
-
isBinary
private boolean isBinary -
mimeType
-
action
-
reason
-
basePath
-
theirPath
-
myPath
-
mergedPath
-
operation
- See Also:
-
srcLeftVersion
- See Also:
-
srcRightVersion
- See Also:
-
-
Constructor Details
-
ConflictDescriptor
public ConflictDescriptor(String path, ConflictDescriptor.Kind conflictKind, NodeKind nodeKind, String propertyName, boolean isBinary, String mimeType, ConflictDescriptor.Action action, ConflictDescriptor.Reason reason, ConflictDescriptor.Operation operation, String basePath, String theirPath, String myPath, String mergedPath, ConflictVersion srcLeft, ConflictVersion srcRight) This constructor should only be called from JNI code.
-
-
Method Details
-
getPath
-
getKind
-
getNodeKind
-
getPropertyName
-
isBinary
public boolean isBinary() -
getMIMEType
-
getAction
-
getReason
-
getBasePath
-
getTheirPath
-
getMyPath
-
getMergedPath
-
getOperation
-
getSrcLeftVersion
-
getSrcRightVersion
-