Package org.eclipse.emf.cdo.spi.server
Class ICommitConflictResolver.Merging
java.lang.Object
org.eclipse.emf.cdo.spi.server.ICommitConflictResolver.Merging
- All Implemented Interfaces:
ICommitConflictResolver
- Enclosing interface:
- ICommitConflictResolver
public static class ICommitConflictResolver.Merging
extends Object
implements ICommitConflictResolver
- Author:
- Eike Stepper
-
Nested Class Summary
Nested classes/interfaces inherited from interface org.eclipse.emf.cdo.spi.server.ICommitConflictResolver
ICommitConflictResolver.Merging -
Constructor Summary
Constructors -
Method Summary
Modifier and TypeMethodDescriptionprotected CDOMergerresolveConflicts(IStoreAccessor.CommitContext commitContext, List<InternalCDORevisionDelta> conflicts) When this method is called, theIStoreAccessor.CommitContext.getOldRevisions()map is filled with the latest valid revisions, chunks ensured.
-
Constructor Details
-
Merging
public Merging()
-
-
Method Details
-
resolveConflicts
public CDOChangeSetData resolveConflicts(IStoreAccessor.CommitContext commitContext, List<InternalCDORevisionDelta> conflicts) Description copied from interface:ICommitConflictResolverWhen this method is called, theIStoreAccessor.CommitContext.getOldRevisions()map is filled with the latest valid revisions, chunks ensured.- Specified by:
resolveConflictsin interfaceICommitConflictResolver
-
createMerger
-