[eclipse-dev] Planning Meeting Notes 4 Jan 2012 (1 discussion topic)

[Curtis Windatt <Curtis_Windatt@xxxxxxxxxx>]

Planning Meeting Notes
4 January 2012

* Please send status notes for next week to Paul Webster

Discussion topic:

How to deal with the few bundles that are different in 3.8 and 4.2?

Right now o.e.ui.workbench and o.e.ui are the 2 main bundles that are different
in both streams.  But features and branding plugins have also been
differentiated in the 2 streams, as well as the 2 platform doc plugins.
 We have 2 possible strategies for dealing with this in git:

1) include all of the plugins in the repo in both branches.  Currently,
eclipse.platform.ui looks like this.

pro: thinking about 3.8 vs 4.2 is the same as the traditional R3_7_maintenance
vs HEAD.  For tools, git cherrypicking allows commits to all of the
non-differentiated plugins (like jface and ide) to be promoted between
the branches really easily (barring actual conflicts).

con: we've found in eclipse.platform.ui that we need to remind developers
to cherrypick any non-conflicting changes between master and R3_development.

2) only have the changed plugins in the R3_development branch.  Currently
eclipse.platform looks like this (well, inverted, but when we make 4.2
the primary build it will switch around).

pro: developers only have to backport changes to R3_development if the
impact the differentiated plugins.

con: This is not the established convention for branches.  To work
in 3.8, you need to clone a given repo twice.  Once to checkout master
for normal plugins and once to checkout R3_development for split plugins.
 This also impacts our auto-tagging since there is not one commit
we can use for build input, but 2, and we cannot tag 2 commits with the
same buildId tag.

It also effects the LongTermSupport work that the Eclipse Foundation is
looking at.  Since the build cannot run from one commit in a repo
with split plugins, it must clone that repo twice (and must know in advance
that's what needs to be done).



SWT
- released new API for specifying compression when writing jpg or png images
( https://bugs.eclipse.org/bugs/show_bug.cgi?id=96320
)
- fixed frequently-occurring leak on gtk ( https://bugs.eclipse.org/bugs/show_bug.cgi?id=367120
)
- committed to 3.7.2: Bug 366989 - [Browser] WebKitGTK crashes when clearing
all session cookies
- holidays

Platform Workspace:
- inbox tracking
- Bug 341036 - Team > Create patch is missing (in EGit) [fixed]
- Bug 367735 - Add support for "workspace patches" [in progress]
- Bug 327381 - Add support for Eclipse-SourceReferences header [in progress]

Platform UI
- mostly vacation
- Eclipse 4/Eclipse 4.2 work
- Platform UI tests compile on 4.2 ... bugs open for failures.

PDE:
- Support for non *.jar bundles in target platform (Bug 355890)
 - Backported to 3.7.2 (Bug 367796)
- New tracing UI bundle added to master branch, but not PDE feature (Bug
296631)
- Vacation (Curtis unavailable Jan 4 - Jan 12)

Debug:
- Bug fixing
- Vacation