Package org.tigris.subversion.javahl
Class ConflictDescriptor
- java.lang.Object
-
- org.tigris.subversion.javahl.ConflictDescriptor
-
public class ConflictDescriptor extends 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 classConflictDescriptor.ActionPoor man's enum forsvn_wc_conflict_action_t.classConflictDescriptor.KindPoor man's enum forsvn_wc_conflict_kind_t.classConflictDescriptor.ReasonPoor 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 intgetAction()StringgetBasePath()intgetKind()StringgetMergedPath()StringgetMIMEType()StringgetMyPath()intgetNodeKind()intgetOperation()StringgetPath()StringgetPropertyName()intgetReason()ConflictVersiongetSrcLeftVersion()ConflictVersiongetSrcRightVersion()StringgetTheirPath()booleanisBinary()
-
-
-
Constructor Detail
-
ConflictDescriptor
public ConflictDescriptor(ConflictDescriptor aDesc)
-
-
Method Detail
-
getPath
public String getPath()
-
getKind
public int getKind()
-
getNodeKind
public int getNodeKind()
- See Also:
NodeKind
-
getPropertyName
public String getPropertyName()
-
isBinary
public boolean isBinary()
-
getMIMEType
public String getMIMEType()
-
getAction
public int getAction()
-
getReason
public int getReason()
-
getBasePath
public String getBasePath()
-
getTheirPath
public String getTheirPath()
-
getMyPath
public String getMyPath()
-
getMergedPath
public String getMergedPath()
-
getOperation
public int getOperation()
-
getSrcLeftVersion
public ConflictVersion getSrcLeftVersion()
-
getSrcRightVersion
public ConflictVersion getSrcRightVersion()
-
-