Package org.apache.subversion.javahl
Class ConflictResult
java.lang.Object
org.apache.subversion.javahl.ConflictResult
public class ConflictResult
extends java.lang.Object
The result returned by the callback API used to handle conflicts
encountered during merge/update/switch operations. Includes a poor
man's enum for
svn_wc_conflict_choice_t
.-
Nested Class Summary
Nested Classes -
Field Summary
FieldsModifier and TypeFieldDescriptionprivate ConflictResult.Choice
A value corresponding to thesvn_wc_conflict_choice_t
enum.private java.lang.String
The path to the result of a merge, ornull
. -
Constructor Summary
ConstructorsConstructorDescriptionConflictResult
(ConflictResult.Choice choice, java.lang.String mergedPath) Create a new conflict result instace. -
Method Summary
Modifier and TypeMethodDescriptionjava.lang.String
Methods inherited from class java.lang.Object
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
-
Field Details
-
choice
A value corresponding to thesvn_wc_conflict_choice_t
enum. -
mergedPath
private java.lang.String mergedPathThe path to the result of a merge, ornull
.
-
-
Constructor Details
-
ConflictResult
Create a new conflict result instace.
-
-
Method Details
-
getChoice
- Returns:
- A value corresponding to the
svn_wc_conflict_choice_t
enum.
-
getMergedPath
public java.lang.String getMergedPath()- Returns:
- The path to the result of a merge, or
null
.
-