public class SVNTreeConflictDescription extends SVNConflictDescription
Constructor and Description |
---|
SVNTreeConflictDescription(java.io.File path,
SVNNodeKind nodeKind,
SVNConflictAction conflictAction,
SVNConflictReason conflictReason,
SVNOperation operation,
SVNConflictVersion sourceLeftVersion,
SVNConflictVersion sourceRightVersion)
Creates a new
SVNTreeConflictDescription . |
Modifier and Type | Method and 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 . |
SVNConflictVersion |
getSourceLeftVersion()
Returns info on the "merge-left source" or "older" version of incoming change.
|
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(SVNConflictVersion sourceLeftVersion) |
getConflictAction, getConflictReason, getMergeFiles, getNodeKind, setConflictAction
public SVNTreeConflictDescription(java.io.File path, SVNNodeKind nodeKind, SVNConflictAction conflictAction, SVNConflictReason conflictReason, SVNOperation operation, SVNConflictVersion sourceLeftVersion, 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 SVNConflictDescription
false
public boolean isPropertyConflict()
false
.isPropertyConflict
in class SVNConflictDescription
false
public boolean isTreeConflict()
true
.isTreeConflict
in class SVNConflictDescription
true
public java.io.File getPath()
getPath
in class SVNConflictDescription
public SVNOperation getOperation()
public SVNConflictVersion getSourceLeftVersion()
public void setSourceLeftVersion(SVNConflictVersion sourceLeftVersion)
public SVNConflictVersion getSourceRightVersion()
public java.lang.String getPropertyName()
null
.getPropertyName
in class SVNConflictDescription
null
Copyright © 2004-2012 TMate Software Ltd. All Rights Reserved.