|
SVNKit Home | ||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | ||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |
java.lang.Objectorg.tmatesoft.svn.core.wc.SVNConflictResult
public class SVNConflictResult
The SVNConflictResult represents the decision of the user's conflict handler
regarding a conflict situation.
Constructor Summary | |
---|---|
SVNConflictResult(SVNConflictChoice conflictChoice,
File mergedFile)
Creates a new SVNConflictChoice object. |
Method Summary | |
---|---|
SVNConflictChoice |
getConflictChoice()
Returns the conflict handler's choice. |
File |
getMergedFile()
Returns the file with the merge result. |
Methods inherited from class java.lang.Object |
---|
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait |
Constructor Detail |
---|
public SVNConflictResult(SVNConflictChoice conflictChoice, File mergedFile)
SVNConflictChoice
object.
conflictChoice
- way that the conflict should be resolved inmergedFile
- file containing the merge resultMethod Detail |
---|
public SVNConflictChoice getConflictChoice()
public File getMergedFile()
result file
obtained by the
user's conflict handler
from the description
's
merge file set
object.
|
SVNKit Home | ||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | ||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |