Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 335773 - CDOMergingConflictResolver messes up savepoint
Summary: CDOMergingConflictResolver messes up savepoint
Status: CLOSED FIXED
Alias: None
Product: EMF
Classification: Modeling
Component: cdo.core (show other bugs)
Version: 4.0   Edit
Hardware: All All
: P3 major (vote)
Target Milestone: ---   Edit
Assignee: Eike Stepper CLA
QA Contact: Eike Stepper CLA
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-01-29 13:05 EST by Eike Stepper CLA
Modified: 2011-06-23 03:41 EDT (History)
1 user (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 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 CLA 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 CLA 2011-01-29 13:06:58 EST 
Resolved
Comment 3 Eike Stepper CLA 2011-01-31 01:43:20 EST 
Committed revision 6984:
- trunk/plugins/org.eclipse.emf.cdo
Comment 4 Eike Stepper CLA 2011-06-23 03:41:51 EDT 
Available in R20110608-1407