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

Bug 333058

Summary:	Provide ability to remerge a branch (specify source range)
Product:	[Modeling] EMF	Reporter:	Eike Stepper <stepper>
Component:	cdo.core	Assignee:	Eike Stepper <stepper>
Status:	CLOSED FIXED	QA Contact:	Eike Stepper <stepper>
Severity:	enhancement
Priority:	P3	Keywords:	noteworthy
Version:	4.0
Target Milestone:	---
Hardware:	All
OS:	All
Whiteboard:	Power to the People

Description Eike Stepper

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

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

2010-12-22 02:16:30 EST

Committed to HEAD

Comment 3 Eike Stepper

2011-06-23 03:38:57 EDT

Available in R20110608-1407