Package org.apache.subversion.javahl
Class ConflictResult
java.lang.Object
org.apache.subversion.javahl.ConflictResult
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 String
The path to the result of a merge, ornull
. -
Constructor Summary
ConstructorsConstructorDescriptionConflictResult
(ConflictResult.Choice choice, String mergedPath) Create a new conflict result instace. -
Method Summary
-
Field Details
-
choice
A value corresponding to thesvn_wc_conflict_choice_t
enum. -
mergedPath
The 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
- Returns:
- The path to the result of a merge, or
null
.
-