public class SVNConflictResult
extends java.lang.Object
conflict handler
regarding a conflict situation.Constructor and Description |
---|
SVNConflictResult(SVNConflictChoice conflictChoice,
java.io.File mergedFile)
Creates a new
SVNConflictChoice object. |
SVNConflictResult(SVNConflictChoice conflictChoice,
java.io.File mergedFile,
boolean saveMerged)
Creates a new
SVNConflictChoice object. |
Modifier and Type | Method and Description |
---|---|
SVNConflictChoice |
getConflictChoice()
Returns the conflict handler's choice.
|
java.io.File |
getMergedFile()
Returns the file with the merge result.
|
boolean |
isIsSaveMerged()
Says if the merged result should be saved or not to preserve
changes made to it during conflict handling.
|
public SVNConflictResult(SVNConflictChoice conflictChoice, java.io.File mergedFile)
SVNConflictChoice
object.conflictChoice
- way that the conflict should be resolved inmergedFile
- file containing the merge resultpublic SVNConflictResult(SVNConflictChoice conflictChoice, java.io.File mergedFile, boolean saveMerged)
SVNConflictChoice
object.conflictChoice
- way that the conflict should be resolved inmergedFile
- file containing the merge resultpublic SVNConflictChoice getConflictChoice()
public java.io.File getMergedFile()
result file
obtained by the
user's conflict handler
from the description
's
merge file set
object.public boolean isIsSaveMerged()
Copyright © 2004-2012 TMate Software Ltd. All Rights Reserved.