Package org.tmatesoft.svn.core.wc
Class SVNMergeResult
java.lang.Object
org.tmatesoft.svn.core.wc.SVNMergeResult
public class SVNMergeResult
extends java.lang.Object
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
-
Field Summary
Fields -
Constructor Summary
ConstructorsModifierConstructorDescriptionprivate
SVNMergeResult
(SVNStatusType status, SVNConflictReason conflictReason) -
Method Summary
Modifier and TypeMethodDescriptionstatic SVNMergeResult
createMergeResult
(SVNStatusType status, SVNConflictReason reason) Creates a new merge result object.Returns conflict reason.Returns merge status.Methods inherited from class java.lang.Object
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
-
Field Details
-
myMergeStatus
-
myConflictReason
-
-
Constructor Details
-
SVNMergeResult
-
-
Method Details
-
createMergeResult
Creates a new merge result object. Ifstatus
is notSVNStatusType.CONFLICTED
,reason
is irrelevant and always set to null. Ifstatus
isSVNStatusType.CONFLICTED
andreason
is null, thenreason
defaults 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.
-