Package org.eclipse.emf.cdo.transaction
Interface CDOMerger
- All Known Subinterfaces:
CDOMerger2
- All Known Implementing Classes:
DefaultCDOMerger
,DefaultCDOMerger.PerFeature
,DefaultCDOMerger.PerFeature.ManyValued
,DefaultCDOMerger.PerFeature.ManyValuedOld
public interface CDOMerger
Calculates the changes between a source
change set
and a target change set
and returns the result relative to their common ancestor.- Since:
- 3.0
- Author:
- Eike Stepper
-
Nested Class Summary
Modifier and TypeInterfaceDescriptionstatic class
Thrown from amerger
in case of conflicting changes in the a source and targetchange sets
. -
Method Summary
Modifier and TypeMethodDescriptionmerge
(CDOChangeSet target, CDOChangeSet source) Calculates the changes between a sourcechange set
and a targetchange set
and returns the result relative to their common ancestor.
-
Method Details
-
merge
Calculates the changes between a sourcechange set
and a targetchange set
and returns the result relative to their common ancestor.- Throws:
CDOMerger.ConflictException
-