Package | Description |
---|---|
org.eclipse.emf.cdo.transaction |
Client concepts for dealing with transactions, distributed transactions and their save points.
|
org.eclipse.emf.cdo.workspace |
Concepts to checkout, open and further operate CDO
workspaces . |
org.eclipse.emf.spi.cdo |
Client service provider interfaces and useful base implementations.
|
Modifier and Type | Interface and Description |
---|---|
interface |
CDOMerger2 |
Modifier and Type | Method and Description |
---|---|
CDOMerger |
CDOMerger.ConflictException.getMerger() |
Modifier and Type | Method and Description |
---|---|
CDOChangeSetData |
CDOPushTransaction.merge(CDOBranch source,
CDOMerger merger) |
CDOChangeSetData |
CDOTransaction.merge(CDOBranch source,
CDOMerger merger)
Merges the changes from the given source branch into this transaction and possibly considers previous merges
from that branch by inspecting the
merge source
information of the commit history . |
CDOChangeSetData |
CDOPushTransaction.merge(CDOBranchPoint source,
CDOBranchPoint sourceBase,
CDOBranchPoint targetBase,
CDOMerger merger) |
CDOChangeSetData |
CDOTransaction.merge(CDOBranchPoint source,
CDOBranchPoint sourceBase,
CDOBranchPoint targetBase,
CDOMerger merger)
Merges the changes between the given source base point and the given source point into this transaction.
|
CDOChangeSetData |
CDOPushTransaction.merge(CDOBranchPoint source,
CDOBranchPoint sourceBase,
CDOMerger merger) |
CDOChangeSetData |
CDOTransaction.merge(CDOBranchPoint source,
CDOBranchPoint sourceBase,
CDOMerger merger)
Merges the changes between the given source base point and the given source point into this transaction.
|
CDOChangeSetData |
CDOPushTransaction.merge(CDOBranchPoint source,
CDOMerger merger) |
CDOChangeSetData |
CDOTransaction.merge(CDOBranchPoint source,
CDOMerger merger)
Merges the changes from the given source point into this transaction and possibly considers previous merges
from that
branch by inspecting the merge source
information of the commit history . |
Constructor and Description |
---|
ConflictException(String message,
CDOMerger merger,
CDOChangeSetData result) |
ConflictException(String message,
Throwable cause,
CDOMerger merger,
CDOChangeSetData result) |
Modifier and Type | Method and Description |
---|---|
CDOTransaction |
CDOWorkspace.merge(CDOMerger merger,
String branchPath) |
CDOTransaction |
CDOWorkspace.merge(CDOMerger merger,
String branchPath,
long timeStamp) |
CDOTransaction |
CDOWorkspace.update(CDOMerger merger) |
Modifier and Type | Class and Description |
---|---|
class |
DefaultCDOMerger
If the meaning of this type isn't clear, there really should be more of a description here...
|
static class |
DefaultCDOMerger.PerFeature
If the meaning of this type isn't clear, there really should be more of a description here...
|
static class |
DefaultCDOMerger.PerFeature.ManyValued
If the meaning of this type isn't clear, there really should be more of a description here...
|
Modifier and Type | Method and Description |
---|---|
CDOMerger |
CDOMergingConflictResolver.getMerger() |
Constructor and Description |
---|
CDOMergingConflictResolver(CDOMerger merger) |
CDOMergingConflictResolver(CDOMerger merger,
boolean ensureRemoteNotifications) |
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