Package org.tmatesoft.svn.core.wc2
Class SvnMergeResult
java.lang.Object
org.tmatesoft.svn.core.wc2.SvnMergeResult
public class SvnMergeResult
extends java.lang.Object
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; base and actual (working) properties.
- Version:
- 1.7
-
Field Summary
FieldsModifier and TypeFieldDescriptionprivate SVNProperties
private SVNProperties
private SVNSkel
private final SVNStatusType
-
Constructor Summary
Constructors -
Method Summary
Modifier and TypeMethodDescriptionstatic SvnMergeResult
create
(SVNStatusType mergeOutcome) Creates merge result object and initializes it with merge outcome (status).Returns all merge actual (working) properties.Returns all base (pristine) properties.Gets conflict.Returns merge outcome (status).void
setActualProperties
(SVNProperties actualProperties) Sets all merge actual (working) properties.void
setBaseProperties
(SVNProperties baseProperties) Sets all base (pristine) properties.void
setConflictSkel
(SVNSkel conflictSkel) Sets conflict.Methods inherited from class java.lang.Object
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
-
Field Details
-
mergeOutcome
-
actualProperties
-
baseProperties
-
conflictSkel
-
-
Constructor Details
-
SvnMergeResult
-
-
Method Details
-
create
Creates merge result object and initializes it with merge outcome (status).- Parameters:
mergeOutcome
- status of merge- Returns:
- newly created merge result object
-
getMergeOutcome
Returns merge outcome (status).- Returns:
- merge outcome (status)
-
getActualProperties
Returns all merge actual (working) properties.- Returns:
- actual properties
-
setActualProperties
Sets all merge actual (working) properties.- Parameters:
actualProperties
- actual properties
-
getBaseProperties
Returns all base (pristine) properties.- Returns:
- base properties
-
setBaseProperties
Sets all base (pristine) properties.- Parameters:
baseProperties
- base properties
-
getConflictSkel
Gets conflict.- Returns:
- conflict
-
setConflictSkel
Sets conflict.- Parameters:
conflictSkel
- conflict
-