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