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

Bug 356049

Summary: CDOWorkspace.merge() is broken
Product: [Modeling] EMF Reporter: Eike Stepper <stepper>
Component: cdo.coreAssignee: Eike Stepper <stepper>
Status: CLOSED FIXED QA Contact: Eike Stepper <stepper>
Severity: normal    
Priority: P3    
Version: 4.1   
Target Milestone: ---   
Hardware: All   
OS: All   
Whiteboard:
Attachments:
Description Flags
Fix
none
Fix v2 none

Description Eike Stepper CLA 2011-08-29 03:15:24 EDT 
Currently it clears the base unconditionally at the end. That wrong because the base must always reflect the potential delta between local and remote and the merger can leave local changes.
Comment 1 Eike Stepper CLA 2011-08-29 03:16:51 EDT 
Created attachment 202300 [details]
Fix
Comment 2 Eike Stepper CLA 2011-08-29 03:45:35 EDT 
Created attachment 202301 [details]
Fix v2
Comment 3 Eike Stepper CLA 2011-08-29 03:46:15 EDT 
Committed revision 8985:
- trunk/plugins/org.eclipse.emf.cdo
- trunk/plugins/org.eclipse.emf.cdo.common
- trunk/plugins/org.eclipse.emf.cdo.server
- trunk/plugins/org.eclipse.emf.cdo.tests
- trunk/plugins/org.eclipse.emf.cdo.workspace
Comment 4 Eike Stepper CLA 2011-08-29 03:46:45 EDT 
Resolved
Comment 5 Eike Stepper CLA 2012-09-21 07:16:42 EDT 
Closing.