Package 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.

Nested Class Summary

Nested Classes

Modifier and Type	Class	Description
static enum	ConflictResult.Choice

Field Summary

Fields

Modifier and Type	Field	Description
private ConflictResult.Choice	choice	A value corresponding to the svn_wc_conflict_choice_t enum.
private String	mergedPath	The path to the result of a merge, or null.

Constructor Summary

Constructors

Constructor	Description
ConflictResult(ConflictResult.Choice choice, String mergedPath)	Create a new conflict result instace.

Method Summary

Modifier and Type	Method	Description
ConflictResult.Choice	getChoice()
String	getMergedPath()

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Field Details

choice

private ConflictResult.Choice choice

A value corresponding to the svn_wc_conflict_choice_t enum.

mergedPath

private String mergedPath

The path to the result of a merge, or null.

Constructor Details

ConflictResult

public ConflictResult(ConflictResult.Choice choice,
 String mergedPath)

Create a new conflict result instace.

Method Details

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.