-
- All Known Implementing Classes:
- DefaultCDOMerger, DefaultCDOMerger.PerFeature, DefaultCDOMerger.PerFeature.ManyValued
public interface CDOMergerCalculates the changes between a sourcechange setand a targetchange setand returns the result relative to their common ancestor.- Since:
- 3.0
-
-
Nested Class Summary
Nested Classes Modifier and Type Interface and Description static classCDOMerger.ConflictExceptionThrown from amergerin case of conflicting changes in the a source and targetchange sets.
-
Method Summary
Methods Modifier and Type Method and Description CDOChangeSetDatamerge(CDOChangeSet target, CDOChangeSet source)Calculates the changes between a sourcechange setand a targetchange setand returns the result relative to their common ancestor.
-
-
-
Method Detail
-
merge
CDOChangeSetData merge(CDOChangeSet target, CDOChangeSet source) throws CDOMerger.ConflictException
Calculates the changes between a sourcechange setand a targetchange setand returns the result relative to their common ancestor.- Throws:
CDOMerger.ConflictException
-
-