Package | Description |
---|---|
org.eclipse.emf.cdo.common.revision |
Common concepts for dealing with revisions and revision lists.
|
org.eclipse.emf.cdo.transaction |
Client concepts for dealing with transactions, distributed transactions and their save points.
|
org.eclipse.emf.spi.cdo |
Client service provider interfaces and useful base implementations.
|
Modifier and Type | Method and Description |
---|---|
static CDOChangeSet |
CDORevisionUtil.createChangeSet(CDOBranchPoint startPoint,
CDOBranchPoint endPoint,
CDOChangeSetData data) |
Modifier and Type | Method and Description |
---|---|
CDOChangeSetData |
CDOMerger.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. |
CDOChangeSetData |
CDOMerger2.merge(CDOChangeSet target,
CDOChangeSet source)
Deprecated.
|
Modifier and Type | Method and Description |
---|---|
CDOChangeSet |
AbstractChangeSetsConflictResolver.getLocalChangeSet() |
CDOChangeSet |
AbstractChangeSetsConflictResolver.getRemoteChangeSet() |
CDOChangeSet |
InternalCDOSession.MergeData.getSourceChanges() |
CDOChangeSet |
InternalCDOSession.MergeData.getTargetChanges() |
Modifier and Type | Method and Description |
---|---|
CDOChangeSetData |
DefaultCDOMerger.merge(CDOChangeSet target,
CDOChangeSet source) |
protected void |
CDOMergingConflictResolver.resolveConflicts(Set<CDOObject> conflicts,
CDOChangeSet remoteChangeSet) |
Constructor and Description |
---|
MergeData(CDOBranchPoint target,
CDOBranchPoint source,
CDOBranchPoint sourceBase,
CDOBranchPoint ancestor,
CDORevisionAvailabilityInfo targetInfo,
CDORevisionAvailabilityInfo sourceInfo,
CDORevisionAvailabilityInfo baseInfo,
CDORevisionAvailabilityInfo ancestorInfo,
Set<CDOID> ids,
CDOChangeSet targetChanges,
CDOChangeSet sourceChanges) |
Copyright (c) 2011-2015 Eike Stepper (Berlin, Germany) and others.