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

Bug 328935

Summary:	Need a story for how to merge 3.x changes to o.e.ui.workbench into the 4.x stream
Product:	[Eclipse Project] Platform	Reporter:	Boris Bokowski <bokowski>
Component:	UI	Assignee:	Paul Webster <pwebster>
Status:	RESOLVED WORKSFORME	QA Contact:
Severity:	normal
Priority:	P3	CC:	hsoliwal, Lars.Vogel, ob1.eclipse, pinnamur, prakash, pwebster, remy.suen, sebastian.zarnekow
Version:	4.1
Target Milestone:	4.2 M7
Hardware:	All
OS:	All
Whiteboard:
Bug Depends on:	349177
Bug Blocks:

Description Boris Bokowski

2010-10-28 10:28:47 EDT

We forked org.eclipse.ui.workbench during the 3.6 development cycle. We need a way to ensure that any fixes that went into the bundle after that or will go into that bundle in the future, are also applied to the 4.x copy.

For each code change, there are three cases:

1. Hasn't been merged yet.
2. Has been merged successfully.
3. Has been looked at but the change doesn't apply to 4.x.

One idea would be to systematically go through every change and add a recognizable code comment to the 3.x stream whenever we did 2. or 3. That way, we could even write a command-line tool that helps us manage this ongoing merge problem.

What else could we do?

Comment 1 Lars Vogel

2010-10-28 14:25:57 EDT

Not sure if that is an option but switching to git might help.They say with Git merging is a piece of cake but I personally have not seen this in action. Perhaps Alex Blewitt might have an option here, I ask him to comment via Twitter.

Comment 2 Paul Webster

2011-06-22 08:47:16 EDT

See also bug 349177

PW

Comment 3 Eric Moffatt

2011-12-09 13:09:53 EST

Aggregate move to M5. Retarget to a different milestone if you wish...

Comment 4 Paul Webster

2012-01-13 11:25:39 EST

Part of this is now covered in bug 359616.  We report commits to common areas that are not propagated between master and R3_development.

Most of org.eclipse.ui.workbench is still excluded, though.

PW

Comment 5 Oleg Besedin

2012-04-05 11:23:31 EDT

Works for me.