Package org.eclipse.emf.cdo.transaction
Interface CDOMerger2
- 
- 
Nested Class Summary- 
Nested classes/interfaces inherited from interface org.eclipse.emf.cdo.transaction.CDOMergerCDOMerger.ConflictException
 
- 
 - 
Method SummaryAll Methods Instance Methods Abstract Methods Deprecated Methods Modifier and Type Method Description CDOChangeSetDatamerge(CDOChangeSet target, CDOChangeSet source)Deprecated.voidmerge(CDOTransaction localTransaction, CDOView remoteView, java.util.Set<CDOID> affectedIDs)
 
- 
- 
- 
Method Detail- 
merge@Deprecated CDOChangeSetData merge(CDOChangeSet target, CDOChangeSet source) throws java.lang.UnsupportedOperationException Deprecated.Description copied from interface:CDOMergerCalculates the changes between a sourcechange setand a targetchange setand returns the result relative to their common ancestor.
 - 
mergevoid merge(CDOTransaction localTransaction, CDOView remoteView, java.util.Set<CDOID> affectedIDs) throws CDOMerger.ConflictException - Throws:
- CDOMerger.ConflictException
 
 
- 
 
-