Package org.tmatesoft.svn.core.wc
Class SVNMergeResult
java.lang.Object
org.tmatesoft.svn.core.wc.SVNMergeResult
The SVNMergeResult represents a result of a text or properties merge operation.
This class combines the following information about a merge result: a status type indicating how merge
finished and, if the merge finished with a conflict, the reason of the conflict (why did the conflict ever
occur?).
- Since:
- 1.2
- Version:
- 1.3
- Author:
- TMate Software Ltd.
-
Method Summary
Modifier and TypeMethodDescriptionstatic SVNMergeResultcreateMergeResult(SVNStatusType status, SVNConflictReason reason) Creates a new merge result object.Returns conflict reason.Returns merge status.
-
Method Details
-
createMergeResult
Creates a new merge result object. Ifstatusis notSVNStatusType.CONFLICTED,reasonis irrelevant and always set to null. IfstatusisSVNStatusType.CONFLICTEDandreasonis null, thenreasondefaults toSVNConflictReason.EDITED.- Parameters:
status- status of merge operationreason- reason of the conflict (if any)- Returns:
- merge result object
-
getMergeStatus
Returns merge status.- Returns:
- merge status type object.
-
getConflictReason
Returns conflict reason.- Returns:
- conflict reason object.
-