Class SVNConflictDescriptor
- java.lang.Object
-
- org.tigris.subversion.svnclientadapter.SVNConflictDescriptor
-
public class SVNConflictDescriptor extends java.lang.Object
The description of a merge conflict, encountered during merge/update/switch operations. copied from JavaHL ConflictDescriptor
-
-
Nested Class Summary
Nested Classes Modifier and Type Class Description class
SVNConflictDescriptor.Action
From JavaHLclass
SVNConflictDescriptor.Kind
From JavaHL.class
SVNConflictDescriptor.Operation
class
SVNConflictDescriptor.Reason
From JavaHL
-
Constructor Summary
Constructors Constructor Description SVNConflictDescriptor(java.lang.String path, int action, int reason, int operation, SVNConflictVersion srcLeftVersion, SVNConflictVersion srcRightVersion)
SVNConflictDescriptor(java.lang.String path, int conflictKind, int nodeKind, java.lang.String propertyName, boolean isBinary, java.lang.String mimeType, int action, int reason, int operation, SVNConflictVersion srcLeftVersion, SVNConflictVersion srcRightVersion, java.lang.String basePath, java.lang.String theirPath, java.lang.String myPath, java.lang.String mergedPath)
-
Method Summary
All Methods Instance Methods Concrete Methods Modifier and Type Method Description int
getAction()
java.lang.String
getBasePath()
int
getConflictKind()
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()
SVNConflictVersion
getSrcLeftVersion()
SVNConflictVersion
getSrcRightVersion()
java.lang.String
getTheirPath()
boolean
isBinary()
boolean
isTreeConflict()
-
-
-
Constructor Detail
-
SVNConflictDescriptor
public SVNConflictDescriptor(java.lang.String path, int conflictKind, int nodeKind, java.lang.String propertyName, boolean isBinary, java.lang.String mimeType, int action, int reason, int operation, SVNConflictVersion srcLeftVersion, SVNConflictVersion srcRightVersion, java.lang.String basePath, java.lang.String theirPath, java.lang.String myPath, java.lang.String mergedPath)
-
SVNConflictDescriptor
public SVNConflictDescriptor(java.lang.String path, int action, int reason, int operation, SVNConflictVersion srcLeftVersion, SVNConflictVersion srcRightVersion)
-
-
Method Detail
-
getPath
public java.lang.String getPath()
-
getConflictKind
public int getConflictKind()
-
getNodeKind
public int getNodeKind()
-
getPropertyName
public java.lang.String getPropertyName()
-
isBinary
public boolean isBinary()
-
getMIMEType
public java.lang.String getMIMEType()
-
getAction
public int getAction()
-
getReason
public int getReason()
-
isTreeConflict
public boolean isTreeConflict()
-
getOperation
public int getOperation()
-
getSrcLeftVersion
public SVNConflictVersion getSrcLeftVersion()
-
getSrcRightVersion
public SVNConflictVersion getSrcRightVersion()
-
getBasePath
public java.lang.String getBasePath()
-
getTheirPath
public java.lang.String getTheirPath()
-
getMyPath
public java.lang.String getMyPath()
-
getMergedPath
public java.lang.String getMergedPath()
-
-