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) 2011-2015 Eike Stepper (Berlin, Germany) and others.