|
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.SVNConflictReason
public class SVNConflictReason
The SVNConflictReason class represents an enumeration of constants describing the reason of a conflict state in a working copy produced by a merge operation.
Field Summary | |
---|---|
static SVNConflictReason |
ADDED
Constant saying that an object is already added or schedule-add |
static SVNConflictReason |
DELETED
Constant saying that an object is already schedule-delete. |
static SVNConflictReason |
EDITED
Constant saying that local edits are already present. |
static SVNConflictReason |
MISSING
Constant saying that an object is unknown or missing. |
static SVNConflictReason |
OBSTRUCTED
Constant saying that another object is in the way. |
static SVNConflictReason |
UNVERSIONED
Constant saying that an object is unversioned. |
Method Summary | |
---|---|
static SVNConflictReason |
fromString(java.lang.String reason)
Converts a string reason name to an SVNConflictReason object. |
java.lang.String |
getName()
Retunrns a string representation of this object. |
java.lang.String |
toString()
Retunrns a string representation of this object. |
Methods inherited from class java.lang.Object |
---|
clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait |
Field Detail |
---|
public static final SVNConflictReason EDITED
public static final SVNConflictReason OBSTRUCTED
public static final SVNConflictReason DELETED
public static final SVNConflictReason MISSING
public static final SVNConflictReason UNVERSIONED
public static final SVNConflictReason ADDED
Method Detail |
---|
public static SVNConflictReason fromString(java.lang.String reason)
SVNConflictReason
object.
reason
- name
SVNConflictReason
that matches the reason
name;
null
if no match is foundpublic java.lang.String getName()
public java.lang.String toString()
toString
in class java.lang.Object
|
SVNKit Home | ||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | ||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |