org.eclipse.emf.cdo.transaction
Interface CDOMerger

All Known Implementing Classes:
DefaultCDOMerger, DefaultCDOMerger.PerFeature, DefaultCDOMerger.PerFeature.ManyValued

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

Nested Class Summary
static class CDOMerger.ConflictException
          Thrown from a merger in case of conflicting changes in the a source and target change sets.
 
Method Summary
 CDOChangeSetData merge(CDOChangeSet target, CDOChangeSet source)
          Calculates the changes between a source change set and a target change set and 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 source change set and a target change set and returns the result relative to their common ancestor.

Throws:
CDOMerger.ConflictException


Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.