Package org.eclipse.emf.cdo.transaction
Interface CDOMerger2
-
-
Nested Class Summary
-
Nested classes/interfaces inherited from interface org.eclipse.emf.cdo.transaction.CDOMerger
CDOMerger.ConflictException
-
-
Method Summary
All Methods Instance Methods Abstract Methods Deprecated Methods Modifier and Type Method Description CDOChangeSetData
merge(CDOChangeSet target, CDOChangeSet source)
Deprecated.void
merge(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:CDOMerger
Calculates the changes between a sourcechange set
and a targetchange set
and returns the result relative to their common ancestor.
-
merge
void merge(CDOTransaction localTransaction, CDOView remoteView, java.util.Set<CDOID> affectedIDs) throws CDOMerger.ConflictException
- Throws:
CDOMerger.ConflictException
-
-