org.apache.subversion.javahl
Class ConflictResult
java.lang.Object
org.apache.subversion.javahl.ConflictResult
public class ConflictResult
- extends 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
.
Methods inherited from class java.lang.Object |
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait |
ConflictResult
public ConflictResult(ConflictResult.Choice choice,
String mergedPath)
- Create a new conflict result instace.
getChoice
public ConflictResult.Choice getChoice()
- Returns:
- A value corresponding to the
svn_wc_conflict_choice_t
enum.
getMergedPath
public String getMergedPath()
- Returns:
- The path to the result of a merge, or
null
.