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 forsvn_wc_conflict_choice_t
.
-
-
Nested Class Summary
Nested Classes Modifier and Type Class Description static class
ConflictResult.Choice
-
Constructor Summary
Constructors Constructor Description ConflictResult(ConflictResult.Choice choice, java.lang.String mergedPath)
Create a new conflict result instace.
-
Method Summary
All Methods Instance Methods Concrete Methods Modifier and Type Method Description ConflictResult.Choice
getChoice()
java.lang.String
getMergedPath()
-
-
-
Constructor Detail
-
ConflictResult
public ConflictResult(ConflictResult.Choice choice, java.lang.String mergedPath)
Create a new conflict result instace.
-
-
Method Detail
-
getChoice
public ConflictResult.Choice 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
.
-
-