org.apache.subversion.javahl
Class ConflictResult

java.lang.Object
  extended by 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.


Nested Class Summary
static class ConflictResult.Choice
           
 
Constructor Summary
ConflictResult(ConflictResult.Choice choice, String mergedPath)
          Create a new conflict result instace.
 
Method Summary
 ConflictResult.Choice getChoice()
           
 String getMergedPath()
           
 
Methods inherited from class java.lang.Object
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
 

Constructor Detail

ConflictResult

public ConflictResult(ConflictResult.Choice choice,
                      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 String getMergedPath()
Returns:
The path to the result of a merge, or null.