|
SVNKit Home | ||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | ||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |
java.lang.Objectorg.tmatesoft.svn.core.wc.SVNConflictDescription
org.tmatesoft.svn.core.wc.SVNTreeConflictDescription
public class SVNTreeConflictDescription
SVNTreeConflictDescription brings information on a tree conflict.
Constructor Summary | |
---|---|
SVNTreeConflictDescription(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 . |
Method Summary | |
---|---|
SVNOperation |
getOperation()
Returns the user operation that exposed this tree conflict. |
File |
getPath()
Returns the wc file. |
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 . |
Methods inherited from class org.tmatesoft.svn.core.wc.SVNConflictDescription |
---|
getConflictAction, getConflictReason, getMergeFiles, getNodeKind, toString |
Methods inherited from class java.lang.Object |
---|
clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait |
Constructor Detail |
---|
public SVNTreeConflictDescription(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 changeMethod Detail |
---|
public 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 File getPath()
getPath
in class SVNConflictDescription
public SVNOperation getOperation()
public org.tmatesoft.svn.core.internal.wc.SVNConflictVersion getSourceLeftVersion()
public org.tmatesoft.svn.core.internal.wc.SVNConflictVersion getSourceRightVersion()
public String getPropertyName()
null
.
getPropertyName
in class SVNConflictDescription
null
|
SVNKit Home | ||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | ||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |