Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[wtp-releng] Heads up: Source Editing is branching for 3.2 after 3.1RC1

Just a brief announcement, but Source Editing will be branching our plug-ins for 3.2 development shortly after RC1 is declared.  Some committers have 3.2 changes waiting to go and we want to minimize the chances of conflicts now that we're fairly sure what will be in the final 3.1 delivery.  HEAD will become our 3.2 branch while R3_1_maintenance will reflect 3.1 RC2, RC3, RC4, and what I expect will be 3.1.1.  The releng.sourceediting map file project from HEAD will still be used for 3.1 builds unless the releng team says otherwise.  What's this mean to you?

If you only download WTP builds from nothing, you're fine.

If you check out WTP Source Editing source code from CVS: for 3.1, you'll want to use the R3_1_maintenance branch.  HEAD will be our 3.2 branch.

If you're a WTP Source Editing Committer: do NOT release code from the HEAD branch after RC1 is declared unless the releng team says otherwise.  The map file project in HEAD will still be used for our 3.1 builds which means you'll need to switch your projects to the R3_1_maintenance branch.  Yes, this means we won't have 3.2 builds for a while and that any changes made into R3_1_maintance for RC2/RC3/RC4 will need to be manually applied to HEAD as well.  The branching is a compromise so that our code changes are merged together, at least in source form, immediately.  That makes running the MasterListTestSuite from development/org.eclipse.wst.sse.unittests locally more important than ever for those of us who don't have local builds set up.  I expect to do this shortly after RC1 is declared, and you'll get an email when it's done.

Nitin Dahyabhai
Eclipse WTP Source Editing
IBM Rational

Back to the top