Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 356049 - CDOWorkspace.merge() is broken
Summary: CDOWorkspace.merge() is broken
Status: CLOSED FIXED
Alias: None
Product: EMF
Classification: Modeling
Component: cdo.core (show other bugs)
Version: 4.1   Edit
Hardware: All All
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Eike Stepper CLA
QA Contact: Eike Stepper CLA
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-08-29 03:15 EDT by Eike Stepper CLA
Modified: 2012-09-21 07:16 EDT (History)
0 users

See Also:

Attachments
Fix (45.53 KB, patch)
2011-08-29 03:16 EDT, Eike Stepper CLA 		no flags Details | Diff
Fix v2 (45.02 KB, patch)
2011-08-29 03:45 EDT, Eike Stepper CLA 		no flags Details | Diff
Show Obsolete (1) View All 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-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.