Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 335773

Summary:	CDOMergingConflictResolver messes up savepoint
Product:	[Modeling] EMF	Reporter:	Eike Stepper <stepper>
Component:	cdo.core	Assignee:	Eike Stepper <stepper>
Status:	CLOSED FIXED	QA Contact:	Eike Stepper <stepper>
Severity:	major
Priority:	P3	CC:	rkrijgsheld
Version:	4.0
Target Milestone:	---
Hardware:	All
OS:	All
Whiteboard:

Description Eike Stepper

2011-01-29 13:05:06 EST

CDOMergingConflictResolver uses a CDOMerger (DefaultCDOMerger works correctly!) and applies the merge result to the transaction. This application was originally developed for merging from different branchs into the current *clean* transaction.

Comment 1 Eike Stepper

2011-01-29 13:05:55 EST

Committed revision 6965:
- trunk/plugins/org.eclipse.emf.cdo
- trunk/plugins/org.eclipse.emf.cdo.tests

Comment 2 Eike Stepper

2011-01-29 13:06:58 EST

Resolved

Comment 3 Eike Stepper

2011-01-31 01:43:20 EST

Committed revision 6984:
- trunk/plugins/org.eclipse.emf.cdo

Comment 4 Eike Stepper

2011-06-23 03:41:51 EDT

Available in R20110608-1407