CDOMerger.ConflictException
Modifier and Type | Method and Description |
---|---|
CDOChangeSetData |
merge(CDOChangeSet target,
CDOChangeSet source)
Deprecated.
|
void |
merge(CDOTransaction localTransaction,
CDOView remoteView,
Set<CDOID> affectedIDs) |
@Deprecated CDOChangeSetData merge(CDOChangeSet target, CDOChangeSet source) throws UnsupportedOperationException
CDOMerger
change set
and a target change
set
and returns the result relative to their common ancestor.merge
in interface CDOMerger
UnsupportedOperationException
void merge(CDOTransaction localTransaction, CDOView remoteView, Set<CDOID> affectedIDs) throws CDOMerger.ConflictException
CDOMerger.ConflictException
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