Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 333058 - Provide ability to remerge a branch (specify source range)
Summary: Provide ability to remerge a branch (specify source range)
Status: CLOSED FIXED
Alias: None
Product: EMF
Classification: Modeling
Component: cdo.core (show other bugs)
Version: 4.0   Edit
Hardware: All All
: P3 enhancement (vote)
Target Milestone: ---   Edit
Assignee: Eike Stepper CLA
QA Contact: Eike Stepper CLA
URL:
Whiteboard: Power to the People
Keywords: noteworthy
Depends on:
Blocks:
 
Reported: 2010-12-22 02:14 EST by Eike Stepper CLA
Modified: 2011-06-23 03:38 EDT (History)
0 users

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-12-22 02:14:48 EST 
CDOTransaction.merge() takes a single CDOBranchPoint source and merges the changes from the common ancestor til the specified source. For remerging without duplicate source deltas we need to be able to specify the source point of the previous merge operation and use it as a source base instead of the common ancestor.
Comment 1 Eike Stepper CLA 2010-12-22 02:15:40 EST 
New CDOTransaction API:

  /**
   * @since 4.0
   */
  public CDOChangeSetData merge(CDOBranchPoint source, CDOBranchPoint sourceBase, CDOMerger merger);
Comment 2 Eike Stepper CLA 2010-12-22 02:16:30 EST 
Committed to HEAD
Comment 3 Eike Stepper CLA 2011-06-23 03:38:57 EDT 
Available in R20110608-1407