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 targetBase,
CDORevisionAvailabilityInfo targetInfo,
CDORevisionAvailabilityInfo sourceInfo,
CDORevisionAvailabilityInfo sourceBaseInfo,
CDORevisionAvailabilityInfo targetBaseInfo,
Set<CDOID> ids,
CDOChangeSet targetChanges,
CDOChangeSet sourceChanges)
Deprecated.
As of 4.6 use
#MergeData(CDOBranchPoint, CDORevisionAvailabilityInfo, CDOBranchPoint, CDORevisionAvailabilityInfo, Set, CDOChangeSet, CDOBranchPoint, CDORevisionAvailabilityInfo, CDOBranchPoint, CDORevisionAvailabilityInfo, Set, CDOChangeSet, CDOBranchPoint) . |
MergeData(CDOBranchPoint target,
CDORevisionAvailabilityInfo targetInfo,
CDOBranchPoint targetBase,
CDORevisionAvailabilityInfo targetBaseInfo,
Set<CDOID> targetIDs,
CDOChangeSet targetChanges,
CDOBranchPoint source,
CDORevisionAvailabilityInfo sourceInfo,
CDOBranchPoint sourceBase,
CDORevisionAvailabilityInfo sourceBaseInfo,
Set<CDOID> sourceIDs,
CDOChangeSet sourceChanges,
CDOBranchPoint resultBase) |
Copyright (c) 2014 Eike Stepper (Berlin, Germany) and others.
All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html