Package org.tmatesoft.svn.core.wc
Class SVNConflictReason
- java.lang.Object
-
- org.tmatesoft.svn.core.wc.SVNConflictReason
-
public class SVNConflictReason extends java.lang.Object
The SVNConflictReason class represents an enumeration of constants describing the reason of a conflict state in a working copy produced by a merge operation.- Since:
- 1.2
- Version:
- 1.3
-
-
Field Summary
Fields Modifier and Type Field Description static SVNConflictReason
ADDED
Constant saying that an object is already added or schedule-addstatic 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
MOVED_AWAY
Constant saying that an object has been moved awaystatic SVNConflictReason
MOVED_HERE
Constant saying that an object has been moved hereprivate java.lang.String
myName
static SVNConflictReason
OBSTRUCTED
Constant saying that another object is in the way.static SVNConflictReason
REPLACED
Constant saying that an object is already replaced.static SVNConflictReason
SKIP
static SVNConflictReason
UNVERSIONED
Constant saying that an object is unversioned.static SVNConflictReason
WC_SKIP
-
Constructor Summary
Constructors Modifier Constructor Description private
SVNConflictReason(java.lang.String name)
-
Method Summary
All Methods Static Methods Instance Methods Concrete Methods Modifier and Type Method Description static SVNConflictReason
fromString(java.lang.String reason)
Converts a string reason name to anSVNConflictReason
object.java.lang.String
getName()
Retunrns a string representation of this object.java.lang.String
toString()
Retunrns a string representation of this object.
-
-
-
Field Detail
-
EDITED
public static final SVNConflictReason EDITED
Constant saying that local edits are already present.
-
OBSTRUCTED
public static final SVNConflictReason OBSTRUCTED
Constant saying that another object is in the way.
-
DELETED
public static final SVNConflictReason DELETED
Constant saying that an object is already schedule-delete.
-
MISSING
public static final SVNConflictReason MISSING
Constant saying that an object is unknown or missing. Reserved (never passed currently).
-
UNVERSIONED
public static final SVNConflictReason UNVERSIONED
Constant saying that an object is unversioned. Reserved (never passed currently).
-
ADDED
public static final SVNConflictReason ADDED
Constant saying that an object is already added or schedule-add
-
REPLACED
public static final SVNConflictReason REPLACED
Constant saying that an object is already replaced.- Since:
- New in 1.7.
-
MOVED_AWAY
public static final SVNConflictReason MOVED_AWAY
Constant saying that an object has been moved away- Since:
- New in 1.8.
-
MOVED_HERE
public static final SVNConflictReason MOVED_HERE
Constant saying that an object has been moved here- Since:
- New in 1.8.
-
SKIP
public static final SVNConflictReason SKIP
- Since:
- New in 1.8.
-
WC_SKIP
public static final SVNConflictReason WC_SKIP
-
myName
private final java.lang.String myName
-
-
Method Detail
-
fromString
public static SVNConflictReason fromString(java.lang.String reason)
Converts a string reason name to anSVNConflictReason
object.- Parameters:
reason
- name- Returns:
- an
SVNConflictReason
that matches thereason
name;null
if no match is found - Since:
- 1.3
-
getName
public java.lang.String getName()
Retunrns a string representation of this object.- Returns:
- conflict reason name
- Since:
- 1.3
-
toString
public java.lang.String toString()
Retunrns a string representation of this object.- Overrides:
toString
in classjava.lang.Object
- Returns:
- conflict reason name
- Since:
- 1.3
-
-