Bug 319090 - Provide a CDOConflictResolver that uses a CDOMerger
Summary: Provide a CDOConflictResolver that uses a CDOMerger
Status: CLOSED FIXED
Alias: None
Product: EMF
Classification: Modeling
Component: cdo.core (show other bugs)
Version: 4.0   Edit
Hardware: PC Windows 7
: P3 enhancement (vote)
Target Milestone: ---   Edit
Assignee: Eike Stepper CLA
QA Contact: Eike Stepper CLA
URL:
Whiteboard: Power to the People
Keywords: noteworthy
: 256492 320485 (view as bug list)
Depends on:
Blocks:
 
Reported: 2010-07-07 04:59 EDT by Eike Stepper CLA
Modified: 2011-06-23 03:40 EDT (History)
6 users (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Eike Stepper CLA 2010-07-07 04:59:40 EDT 
The new (in 3.0) CDOMerger implementations are far more sophisticated than our old AbstractObjectConflictResolver types. The goal is to develop a CDOMergingConflictResolver that leverages the new code.
Comment 1 Eike Stepper CLA 2010-07-07 05:13:08 EDT 
New API:

org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta.copy()
org.eclipse.emf.cdo.common.commit.CDOChangeSetData.copy()
org.eclipse.emf.cdo.common.commit.CDOChangeSetData.merge(CDOChangeSetData)
org.eclipse.emf.cdo.common.commit.CDOChangeSetDataProvider
org.eclipse.emf.cdo.transaction.CDOTransaction.getChangeSetData()

New SPI:

org.eclipse.emf.spi.cdo.AbstractConflictResolver
org.eclipse.emf.spi.cdo.AbstractChangeSetsConflictResolver
org.eclipse.emf.spi.cdo.CDOMergingConflictResolver
org.eclipse.emf.spi.cdo.CDOChangeSubscriptionAdapter
org.eclipse.emf.spi.cdo.CDOSessionInvalidationAggregator
Comment 2 Eike Stepper CLA 2010-07-22 02:09:56 EDT 
*** Bug 320485 has been marked as a duplicate of this bug. ***
Comment 3 Eike Stepper CLA 2010-08-09 12:35:18 EDT 
It's not well-tested (just org.eclipse.emf.cdo.tests.ConflictResolverTest.testCDOMergingConflictResolver) but it seems to work basically.

Committed to HEAD
Comment 4 Eike Stepper CLA 2010-09-24 13:03:50 EDT 
*** Bug 256492 has been marked as a duplicate of this bug. ***
Comment 5 Eike Stepper CLA 2011-06-23 03:40:30 EDT 
Available in R20110608-1407