Package org.tigris.subversion.javahl
Class ConflictDescriptor
- java.lang.Object
-
- org.tigris.subversion.javahl.ConflictDescriptor
-
public class ConflictDescriptor extends java.lang.Object
The description of a merge conflict, encountered during merge/update/switch operations.- Since:
- 1.5
-
-
Nested Class Summary
Nested Classes Modifier and Type Class Description class
ConflictDescriptor.Action
Poor man's enum forsvn_wc_conflict_action_t
.class
ConflictDescriptor.Kind
Poor man's enum forsvn_wc_conflict_kind_t
.class
ConflictDescriptor.Reason
Poor man's enum forsvn_wc_conflict_reason_t
.
-
Constructor Summary
Constructors Constructor Description ConflictDescriptor(ConflictDescriptor aDesc)
-
Method Summary
All Methods Instance Methods Concrete Methods Modifier and Type Method Description int
getAction()
java.lang.String
getBasePath()
int
getKind()
java.lang.String
getMergedPath()
java.lang.String
getMIMEType()
java.lang.String
getMyPath()
int
getNodeKind()
int
getOperation()
java.lang.String
getPath()
java.lang.String
getPropertyName()
int
getReason()
ConflictVersion
getSrcLeftVersion()
ConflictVersion
getSrcRightVersion()
java.lang.String
getTheirPath()
boolean
isBinary()
-
-
-
Constructor Detail
-
ConflictDescriptor
public ConflictDescriptor(ConflictDescriptor aDesc)
-
-
Method Detail
-
getPath
public java.lang.String getPath()
-
getKind
public int getKind()
-
getNodeKind
public int getNodeKind()
- See Also:
NodeKind
-
getPropertyName
public java.lang.String getPropertyName()
-
isBinary
public boolean isBinary()
-
getMIMEType
public java.lang.String getMIMEType()
-
getAction
public int getAction()
-
getReason
public int getReason()
-
getBasePath
public java.lang.String getBasePath()
-
getTheirPath
public java.lang.String getTheirPath()
-
getMyPath
public java.lang.String getMyPath()
-
getMergedPath
public java.lang.String getMergedPath()
-
getOperation
public int getOperation()
-
getSrcLeftVersion
public ConflictVersion getSrcLeftVersion()
-
getSrcRightVersion
public ConflictVersion getSrcRightVersion()
-
-