public interface IStorageMerger
IStorage. The merged result is written to an output stream.
Clients must implement this interface when contributing new mergers to the
org.eclipse.team.core.storageMergers extension point.
|Modifier and Type||Field and Description|
Indicates that a change conflict prevented the merge from successful completion (value
Status code describing an internal error (value
Indicates the successful completion of the merge operation (value
Indicates that at least one of the encodings associated with the input was unsupported (value
|Modifier and Type||Method and Description|
Return whether this merger can merge the two contributors without an ancestor.
Performs a merge operation on the given storage instances and writes the merge result to the output stream.
static final int OK
static final int CONFLICT
static final int INTERNAL_ERROR
static final int UNSUPPORTED_ENCODING
IStatus merge(OutputStream output, String outputEncoding, IStorage ancestor, IStorage target, IStorage other, IProgressMonitor monitor) throws CoreException
IStatus.OKis returned, on error a status
IStatus.ERROR. If the merge operation cannot deal with conflicts, the code of the error status has the value
IStreamMerger.CONFLICT. For text oriented mergers the encoding for the input and output is honored if they implement
IEncodedStorage. It is the responsibility of callers to close the output stream.
The provided ancestor may be
null if this merger
output- the byte stream to which the merge result is written; the merger will not close the stream
outputEncoding- the encoding to use when writing to the output stream
ancestor- the storage from which the common ancestor is read
target- the storage containing the target of the merge
other- the storage containing the target of the merge
monitor- reports progress of the merge operation
CoreException- if an error occurs
Copyright (c) 2000, 2016 Eclipse Contributors and others. All rights reserved.Guidelines for using Eclipse APIs.