Package org.tmatesoft.svn.core.wc
Class SVNConflictReason
java.lang.Object
org.tmatesoft.svn.core.wc.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.
- Since:
- 1.2
- Version:
- 1.3
-
Field Summary
FieldsModifier and TypeFieldDescriptionstatic final SVNConflictReason
Constant saying that an object is already added or schedule-addstatic final SVNConflictReason
Constant saying that an object is already schedule-delete.static final SVNConflictReason
Constant saying that local edits are already present.static final SVNConflictReason
Constant saying that an object is unknown or missing.static final SVNConflictReason
Constant saying that an object has been moved awaystatic final SVNConflictReason
Constant saying that an object has been moved hereprivate final String
static final SVNConflictReason
Constant saying that another object is in the way.static final SVNConflictReason
Constant saying that an object is already replaced.static final SVNConflictReason
static final SVNConflictReason
Constant saying that an object is unversioned.static final SVNConflictReason
-
Constructor Summary
Constructors -
Method Summary
Modifier and TypeMethodDescriptionstatic SVNConflictReason
fromString
(String reason) Converts a string reason name to anSVNConflictReason
object.getName()
Retunrns a string representation of this object.toString()
Retunrns a string representation of this object.
-
Field Details
-
EDITED
Constant saying that local edits are already present. -
OBSTRUCTED
Constant saying that another object is in the way. -
DELETED
Constant saying that an object is already schedule-delete. -
MISSING
Constant saying that an object is unknown or missing. Reserved (never passed currently). -
UNVERSIONED
Constant saying that an object is unversioned. Reserved (never passed currently). -
ADDED
Constant saying that an object is already added or schedule-add -
REPLACED
Constant saying that an object is already replaced.- Since:
- New in 1.7.
-
MOVED_AWAY
Constant saying that an object has been moved away- Since:
- New in 1.8.
-
MOVED_HERE
Constant saying that an object has been moved here- Since:
- New in 1.8.
-
SKIP
- Since:
- New in 1.8.
-
WC_SKIP
-
myName
-
-
Constructor Details
-
SVNConflictReason
-
-
Method Details
-
fromString
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
Retunrns a string representation of this object.- Returns:
- conflict reason name
- Since:
- 1.3
-
toString
Retunrns a string representation of this object.
-