org.tigris.subversion.svnclientadapter
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
Constructor Summary |
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)
|
Methods inherited from class java.lang.Object |
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait |
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)
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()
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()