Package org.tmatesoft.svn.core.wc
Class SVNConflictResult
java.lang.Object
org.tmatesoft.svn.core.wc.SVNConflictResult
The SVNConflictResult represents the decision of the user's
conflict handler
regarding a conflict situation.- Since:
- 1.2
- Version:
- 1.3
-
Field Summary
Fields -
Constructor Summary
ConstructorsConstructorDescriptionSVNConflictResult
(SVNConflictChoice conflictChoice, File mergedFile) Creates a newSVNConflictChoice
object.SVNConflictResult
(SVNConflictChoice conflictChoice, File mergedFile, boolean saveMerged) Creates a newSVNConflictChoice
object. -
Method Summary
Modifier and TypeMethodDescriptionReturns the conflict handler's choice.Returns the file with the merge result.boolean
Says if the merged result should be saved or not to preserve changes made to it during conflict handling.
-
Field Details
-
myConflictChoice
-
myMergedFile
-
myIsSaveMerged
private boolean myIsSaveMerged
-
-
Constructor Details
-
SVNConflictResult
Creates a newSVNConflictChoice
object.- Parameters:
conflictChoice
- way that the conflict should be resolved inmergedFile
- file containing the merge result
-
SVNConflictResult
Creates a newSVNConflictChoice
object.- Parameters:
conflictChoice
- way that the conflict should be resolved inmergedFile
- file containing the merge result- Since:
- 1.3.3
-
-
Method Details
-
getConflictChoice
Returns the conflict handler's choice. This way implementor can manage conflicts providing a choice object defining what to do with the conflict.- Returns:
- conflict choice
-
getMergedFile
Returns the file with the merge result. Usually this will be theresult file
obtained by the user'sconflict handler
from thedescription
'smerge file set
object.- Returns:
- merged file
-
isIsSaveMerged
public boolean isIsSaveMerged()Says if the merged result should be saved or not to preserve changes made to it during conflict handling.- Returns:
- true if the merge result should be saved; false otherwise
- Since:
- 1.3.3
-