Package org.eclipse.emf.cdo.transaction
Interface CDOMerger2
- All Superinterfaces:
CDOMerger
Merges the changes between a local
transaction
and a remote view
into the local transaction. Only the changes of a set of affected objects
,
specified by the set of their ids
, is considered.- Since:
- 4.5
- Author:
- Eike Stepper
-
Nested Class Summary
Nested classes/interfaces inherited from interface org.eclipse.emf.cdo.transaction.CDOMerger
CDOMerger.ConflictException
-
Method Summary
Modifier and TypeMethodDescriptionmerge
(CDOChangeSet target, CDOChangeSet source) Deprecated.void
merge
(CDOTransaction localTransaction, CDOView remoteView, Set<CDOID> affectedIDs)
-
Method Details
-
merge
@Deprecated CDOChangeSetData merge(CDOChangeSet target, CDOChangeSet source) throws UnsupportedOperationException Deprecated.Description copied from interface:CDOMerger
Calculates the changes between a sourcechange set
and a targetchange set
and returns the result relative to their common ancestor.- Specified by:
merge
in interfaceCDOMerger
- Throws:
UnsupportedOperationException
- No Reference
- This method is not intended to be referenced by clients.
-
merge
void merge(CDOTransaction localTransaction, CDOView remoteView, Set<CDOID> affectedIDs) throws CDOMerger.ConflictException - Throws:
CDOMerger.ConflictException
-