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 for svn_wc_conflict_choice_t.

Nested Class Summary

Nested Classes

Modifier and Type	Class and Description
static class	ConflictResult.Choice

Field Summary

Fields

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

Constructor Summary

Constructors

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

Method Summary

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

Methods inherited from class java.lang.Object

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

Field Detail

choice

private ConflictResult.Choice choice

A value corresponding to the svn_wc_conflict_choice_t enum.

mergedPath

private java.lang.String mergedPath

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

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.