org.tigris.subversion.javahl
Class ConflictResult

java.lang.Object
  org.tigris.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.

Since:

1.5

Field Summary

static int	chooseBase Resolve the conflict by choosing the base file.
static int	chooseMerged Resolve the conflict by choosing the merged object (potentially manually edited).
static int	chooseMineConflict Resolve the conflict by choosing own (local) version of the object (for conflicted hunks only).
static int	chooseMineFull Resolve the conflict by choosing own (local) version of the object.
static int	chooseTheirsConflict Resolve the conflict by choosing the incoming (repository) version of the object (for conflicted hunks only).
static int	chooseTheirsFull Resolve the conflict by choosing the incoming (repository) version of the object.
static int	postpone Nothing done to resolve the conflict; conflict remains.

Constructor Summary

ConflictResult(int choice, String mergedPath)
Create a new conflict result instance.

Method Summary

int	getChoice()
String	getMergedPath()
ConflictResult	toApache()

Methods inherited from class java.lang.Object

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

Field Detail

postpone

public static final int postpone

Nothing done to resolve the conflict; conflict remains.

See Also:

Constant Field Values

chooseBase

public static final int chooseBase

Resolve the conflict by choosing the base file.

See Also:

Constant Field Values

chooseTheirsFull

public static final int chooseTheirsFull

Resolve the conflict by choosing the incoming (repository) version of the object.

See Also:

Constant Field Values

chooseMineFull

public static final int chooseMineFull

Resolve the conflict by choosing own (local) version of the object.

See Also:

Constant Field Values

chooseTheirsConflict

public static final int chooseTheirsConflict

Resolve the conflict by choosing the incoming (repository) version of the object (for conflicted hunks only).

See Also:

Constant Field Values

chooseMineConflict

public static final int chooseMineConflict

Resolve the conflict by choosing own (local) version of the object (for conflicted hunks only).

See Also:

Constant Field Values

chooseMerged

public static final int chooseMerged

Resolve the conflict by choosing the merged object (potentially manually edited).

See Also:

Constant Field Values

Constructor Detail

ConflictResult

public ConflictResult(int choice,
                      String mergedPath)

Create a new conflict result instance.

Method Detail

toApache

public ConflictResult toApache()

getChoice

public int 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.