Package org.eclipse.team.core.mapping
Interface IMergeStatus
- All Superinterfaces:
IStatus
- All Known Implementing Classes:
MergeStatus
A special status that is returned when the return code of the
merge
method is CONFLICTS
. It is possible that
there were problems that caused the auto-merge to fail. In that case, the
implementor of IResourceMappingMerger
can return a multi-status
in which one of the children is a MergeStatus
and the others
describe other problems that were encountered.- Since:
- 3.2
- See Also:
- Restriction:
- This interface is not intended to be implemented by clients.
-
Field Summary
Modifier and TypeFieldDescriptionstatic final int
Indicates that a change conflict prevented some or all of the resource mappings to be merged (value1
).static final int
Status code describing an internal error (value2
). -
Method Summary
Modifier and TypeMethodDescriptionIFile[]
Returns the set of file for which an auto-merge was not performed.Returns the set of resource mappings for which an auto-merge was not performed.Methods inherited from interface org.eclipse.core.runtime.IStatus
getChildren, getCode, getException, getMessage, getPlugin, getSeverity, isMultiStatus, isOK, matches
-
Field Details
-
CONFLICTS
static final int CONFLICTSIndicates that a change conflict prevented some or all of the resource mappings to be merged (value1
). When this code is returned, the status must be of typeMergeStatus
and must contain the list of all resource mappings for which a manual merge is required.- See Also:
-
INTERNAL_ERROR
static final int INTERNAL_ERRORStatus code describing an internal error (value2
). The status return is not required to be of typeMergeStatus
for internal errors.- See Also:
-
-
Method Details
-
getConflictingMappings
ResourceMapping[] getConflictingMappings()Returns the set of resource mappings for which an auto-merge was not performed. If the code of the status isCONFLICTS
the status may contain a set of mappings or files depending on what method returned the status.- Returns:
- the set of resource mappings for which an auto-merge was not performed.
-
getConflictingFiles
IFile[] getConflictingFiles()Returns the set of file for which an auto-merge was not performed. If the code of the status isCONFLICTS
the status may contain a set of mappings or files depending on what method returned the status.- Returns:
- the set of files for which an auto-merge was not performed.
-