Package org.tmatesoft.svn.core.wc
Class SVNTreeConflictDescription
java.lang.Object
org.tmatesoft.svn.core.wc.SVNConflictDescription
org.tmatesoft.svn.core.wc.SVNTreeConflictDescription
SVNTreeConflictDescription brings information on a tree conflict.
- Since:
- 1.3
- Version:
- 1.3
-
Field Summary
FieldsModifier and TypeFieldDescriptionprivate SVNOperation
private SVNConflictVersion
private SVNConflictVersion
-
Constructor Summary
ConstructorsConstructorDescriptionSVNTreeConflictDescription
(java.io.File path, SVNNodeKind nodeKind, SVNConflictAction conflictAction, SVNConflictReason conflictReason, SVNOperation operation, SVNConflictVersion sourceLeftVersion, SVNConflictVersion sourceRightVersion) Creates a newSVNTreeConflictDescription
. -
Method Summary
Modifier and TypeMethodDescriptionReturns the user operation that exposed this tree conflict.java.io.File
getPath()
Returns the wc file.java.lang.String
Returnsnull
.Returns info on the "merge-left source" or "older" version of incoming change.Returns info on the "merge-right source" or "their" version of incoming change.boolean
Returnsfalse
.boolean
Returnsfalse
.boolean
Returnstrue
.void
setSourceLeftVersion
(SVNConflictVersion sourceLeftVersion) Methods inherited from class org.tmatesoft.svn.core.wc.SVNConflictDescription
getConflictAction, getConflictReason, getMergeFiles, getNodeKind, setConflictAction
Methods inherited from class java.lang.Object
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
-
Field Details
-
myOperation
-
mySourceLeftVersion
-
mySourceRightVersion
-
-
Constructor Details
-
SVNTreeConflictDescription
public SVNTreeConflictDescription(java.io.File path, SVNNodeKind nodeKind, SVNConflictAction conflictAction, SVNConflictReason conflictReason, SVNOperation operation, SVNConflictVersion sourceLeftVersion, SVNConflictVersion sourceRightVersion) Creates a newSVNTreeConflictDescription
.- Parameters:
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 change- Since:
- 1.3
-
-
Method Details
-
isTextConflict
public boolean isTextConflict()Returnsfalse
.- Specified by:
isTextConflict
in classSVNConflictDescription
- Returns:
false
- Since:
- 1.3
-
isPropertyConflict
public boolean isPropertyConflict()Returnsfalse
.- Specified by:
isPropertyConflict
in classSVNConflictDescription
- Returns:
false
- Since:
- 1.3
-
isTreeConflict
public boolean isTreeConflict()Returnstrue
.- Specified by:
isTreeConflict
in classSVNConflictDescription
- Returns:
true
- Since:
- 1.3
-
getPath
public java.io.File getPath()Returns the wc file.- Overrides:
getPath
in classSVNConflictDescription
- Returns:
- detranslated wc file
- Since:
- 1.3
-
getOperation
Returns the user operation that exposed this tree conflict.- Returns:
- user operation
- Since:
- 1.3
-
getSourceLeftVersion
Returns info on the "merge-left source" or "older" version of incoming change.- Returns:
- left version info
- Since:
- 1.3
-
setSourceLeftVersion
-
getSourceRightVersion
Returns info on the "merge-right source" or "their" version of incoming change.- Returns:
- right version info
- Since:
- 1.3
-
getPropertyName
public java.lang.String getPropertyName()Returnsnull
.- Specified by:
getPropertyName
in classSVNConflictDescription
- Returns:
null
- Since:
- 1.3
-