Package org.tigris.subversion.javahl
Class ConflictResult
java.lang.Object
org.tigris.subversion.javahl.ConflictResult
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
FieldsModifier and TypeFieldDescriptionprivate int
A value corresponding to thesvn_wc_conflict_choice_t
enum.static final int
Resolve the conflict by choosing the base file.static final int
Resolve the conflict by choosing the merged object (potentially manually edited).static final int
Resolve the conflict by choosing own (local) version of the object (for conflicted hunks only).static final int
Resolve the conflict by choosing own (local) version of the object.static final int
Resolve the conflict by choosing the incoming (repository) version of the object (for conflicted hunks only).static final int
Resolve the conflict by choosing the incoming (repository) version of the object.private String
The path to the result of a merge, ornull
.static final int
Nothing done to resolve the conflict; conflict remains. -
Constructor Summary
ConstructorsConstructorDescriptionConflictResult
(int choice, String mergedPath) Create a new conflict result instace. -
Method Summary
-
Field Details
-
postpone
public static final int postponeNothing done to resolve the conflict; conflict remains.- See Also:
-
chooseBase
public static final int chooseBaseResolve the conflict by choosing the base file.- See Also:
-
chooseTheirsFull
public static final int chooseTheirsFullResolve the conflict by choosing the incoming (repository) version of the object.- See Also:
-
chooseMineFull
public static final int chooseMineFullResolve the conflict by choosing own (local) version of the object.- See Also:
-
chooseTheirsConflict
public static final int chooseTheirsConflictResolve the conflict by choosing the incoming (repository) version of the object (for conflicted hunks only).- See Also:
-
chooseMineConflict
public static final int chooseMineConflictResolve the conflict by choosing own (local) version of the object (for conflicted hunks only).- See Also:
-
chooseMerged
public static final int chooseMergedResolve the conflict by choosing the merged object (potentially manually edited).- See Also:
-
choice
private int choiceA value corresponding to thesvn_wc_conflict_choice_t
enum. -
mergedPath
The path to the result of a merge, ornull
.
-
-
Constructor Details
-
ConflictResult
Create a new conflict result instace.
-
-
Method Details
-
toApache
-
getChoice
public int getChoice()- Returns:
- A value corresponding to the
svn_wc_conflict_choice_t
enum.
-
getMergedPath
- Returns:
- The path to the result of a merge, or
null
.
-