Package org.tmatesoft.svn.core.wc2
Class SvnMergeResult
java.lang.Object
org.tmatesoft.svn.core.wc2.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; base and actual (working) properties.
- Version:
- 1.7
- Author:
- TMate Software Ltd.
-
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.org.tmatesoft.svn.core.internal.util.SVNSkel
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
(org.tmatesoft.svn.core.internal.util.SVNSkel conflictSkel) Sets conflict.
-
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
public org.tmatesoft.svn.core.internal.util.SVNSkel getConflictSkel()Gets conflict.- Returns:
- conflict
-
setConflictSkel
public void setConflictSkel(org.tmatesoft.svn.core.internal.util.SVNSkel conflictSkel) Sets conflict.- Parameters:
conflictSkel
- conflict
-