public class SVNTreeConflictDescription extends SVNConflictDescription
| Constructor | Description |
|---|---|
SVNTreeConflictDescription(java.io.File path,
SVNNodeKind nodeKind,
SVNConflictAction conflictAction,
SVNConflictReason conflictReason,
SVNOperation operation,
org.tmatesoft.svn.core.internal.wc.SVNConflictVersion sourceLeftVersion,
org.tmatesoft.svn.core.internal.wc.SVNConflictVersion sourceRightVersion) |
Creates a new
SVNTreeConflictDescription. |
| Modifier and Type | Method | Description |
|---|---|---|
SVNOperation |
getOperation() |
Returns the user operation that exposed this tree conflict.
|
java.io.File |
getPath() |
Returns the wc file.
|
java.lang.String |
getPropertyName() |
Returns
null. |
org.tmatesoft.svn.core.internal.wc.SVNConflictVersion |
getSourceLeftVersion() |
Returns info on the "merge-left source" or "older" version of incoming change.
|
org.tmatesoft.svn.core.internal.wc.SVNConflictVersion |
getSourceRightVersion() |
Returns info on the "merge-right source" or "their" version of incoming change.
|
boolean |
isPropertyConflict() |
Returns
false. |
boolean |
isTextConflict() |
Returns
false. |
boolean |
isTreeConflict() |
Returns
true. |
void |
setSourceLeftVersion(org.tmatesoft.svn.core.internal.wc.SVNConflictVersion sourceLeftVersion) |
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, waitgetConflictAction, getConflictReason, getMergeFiles, getNodeKind, setConflictActionpublic SVNTreeConflictDescription(java.io.File path,
SVNNodeKind nodeKind,
SVNConflictAction conflictAction,
SVNConflictReason conflictReason,
SVNOperation operation,
org.tmatesoft.svn.core.internal.wc.SVNConflictVersion sourceLeftVersion,
org.tmatesoft.svn.core.internal.wc.SVNConflictVersion sourceRightVersion)
SVNTreeConflictDescription.path - wc pathnodeKind - kind of the node, on which the tree conflict occurredconflictAction - action which lead to the conflictconflictReason - reason why the conflict occurredoperation - user operation which exposed the conflictsourceLeftVersion - info on the "merge-left source" or "older" version of incoming changesourceRightVersion - info on the "merge-right source" or "their" version of incoming changepublic boolean isTextConflict()
false.isTextConflict in class SVNConflictDescriptionfalsepublic boolean isPropertyConflict()
false.isPropertyConflict in class SVNConflictDescriptionfalsepublic boolean isTreeConflict()
true.isTreeConflict in class SVNConflictDescriptiontruepublic java.io.File getPath()
getPath in class SVNConflictDescriptionpublic SVNOperation getOperation()
public org.tmatesoft.svn.core.internal.wc.SVNConflictVersion getSourceLeftVersion()
public void setSourceLeftVersion(org.tmatesoft.svn.core.internal.wc.SVNConflictVersion sourceLeftVersion)
public org.tmatesoft.svn.core.internal.wc.SVNConflictVersion getSourceRightVersion()
public java.lang.String getPropertyName()
null.getPropertyName in class SVNConflictDescriptionnull