Class SVNConflictDescriptor
java.lang.Object
org.tigris.subversion.svnclientadapter.SVNConflictDescriptor
The description of a merge conflict, encountered during
merge/update/switch operations.
copied from JavaHL ConflictDescriptor
-
Nested Class Summary
Nested ClassesModifier and TypeClassDescriptionfinal class
From JavaHLfinal class
From JavaHL.final class
final class
From JavaHL -
Constructor Summary
ConstructorsConstructorDescriptionSVNConflictDescriptor
(String path, int action, int reason, int operation, SVNConflictVersion srcLeftVersion, SVNConflictVersion srcRightVersion) SVNConflictDescriptor
(String path, int conflictKind, int nodeKind, String propertyName, boolean isBinary, String mimeType, int action, int reason, int operation, SVNConflictVersion srcLeftVersion, SVNConflictVersion srcRightVersion, String basePath, String theirPath, String myPath, String mergedPath) -
Method Summary
-
Constructor Details
-
SVNConflictDescriptor
public SVNConflictDescriptor(String path, int conflictKind, int nodeKind, String propertyName, boolean isBinary, String mimeType, int action, int reason, int operation, SVNConflictVersion srcLeftVersion, SVNConflictVersion srcRightVersion, String basePath, String theirPath, String myPath, String mergedPath) -
SVNConflictDescriptor
public SVNConflictDescriptor(String path, int action, int reason, int operation, SVNConflictVersion srcLeftVersion, SVNConflictVersion srcRightVersion)
-
-
Method Details
-
getPath
-
getConflictKind
public int getConflictKind() -
getNodeKind
public int getNodeKind() -
getPropertyName
-
isBinary
public boolean isBinary() -
getMIMEType
-
getAction
public int getAction() -
getReason
public int getReason() -
isTreeConflict
public boolean isTreeConflict() -
getOperation
public int getOperation() -
getSrcLeftVersion
-
getSrcRightVersion
-
getBasePath
-
getTheirPath
-
getMyPath
-
getMergedPath
-