diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOMerger.java')
-rw-r--r-- | plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOMerger.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOMerger.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOMerger.java index e7d8e16390..4ff885d6c1 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOMerger.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOMerger.java @@ -14,14 +14,24 @@ import org.eclipse.emf.cdo.common.commit.CDOChangeSet; import org.eclipse.emf.cdo.common.commit.CDOChangeSetData; /** + * Calculates the changes between a source {@link CDOChangeSet change set} and a target {@link CDOChangeSet change set} + * and returns the result relative to their common ancestor. + * * @author Eike Stepper * @since 3.0 */ public interface CDOMerger { + /** + * Calculates the changes between a source {@link CDOChangeSet change set} and a target {@link CDOChangeSet change + * set} and returns the result relative to their common ancestor. + */ public CDOChangeSetData merge(CDOChangeSet target, CDOChangeSet source) throws ConflictException; /** + * Thrown from a {@link CDOMerger merger} in case of conflicting changes in the a source and target + * {@link CDOChangeSet change sets}. + * * @author Eike Stepper * @since 4.0 */ |