Package org.tmatesoft.svn.core.wc
Class SVNTreeConflictDescription
- java.lang.Object
-
- org.tmatesoft.svn.core.wc.SVNConflictDescription
-
- org.tmatesoft.svn.core.wc.SVNTreeConflictDescription
-
public class SVNTreeConflictDescription extends SVNConflictDescription
SVNTreeConflictDescription brings information on a tree conflict.- Since:
- 1.3
- Version:
- 1.3
- Author:
- TMate Software Ltd.
-
-
Constructor Summary
Constructors Constructor Description SVNTreeConflictDescription(java.io.File path, SVNNodeKind nodeKind, SVNConflictAction conflictAction, SVNConflictReason conflictReason, SVNOperation operation, SVNConflictVersion sourceLeftVersion, SVNConflictVersion sourceRightVersion)
Creates a newSVNTreeConflictDescription
.
-
Method Summary
All Methods Instance Methods Concrete Methods 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()
Returnsnull
.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()
Returnsfalse
.boolean
isTextConflict()
Returnsfalse
.boolean
isTreeConflict()
Returnstrue
.void
setSourceLeftVersion(SVNConflictVersion sourceLeftVersion)
-
Methods inherited from class org.tmatesoft.svn.core.wc.SVNConflictDescription
getConflictAction, getConflictReason, getMergeFiles, getNodeKind, setConflictAction
-
-
-
-
Constructor Detail
-
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 Detail
-
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
public SVNOperation getOperation()
Returns the user operation that exposed this tree conflict.- Returns:
- user operation
- Since:
- 1.3
-
getSourceLeftVersion
public SVNConflictVersion getSourceLeftVersion()
Returns info on the "merge-left source" or "older" version of incoming change.- Returns:
- left version info
- Since:
- 1.3
-
setSourceLeftVersion
public void setSourceLeftVersion(SVNConflictVersion sourceLeftVersion)
-
getSourceRightVersion
public SVNConflictVersion 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
-
-