[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [eclipse-pmc] Review of mass changes

@Lars : Please find the outline of merge strategy of JDT

(1) JDT creates a BETA_JAVAn [where n=13 currently] for every Java release and the merge from the master to the BETA branch is done regularly - in terms of (1) periodically every milestone (2) regularly if there are major changes in master and (3) if there are major changes in BETA_JAVAn itself.

(2) It should also be noted that the BETA_JAVAn will merge to master every six months - and this merge is fixed to be done in M1 - in fact early M1 - mostly as one of the initial commits given the close release dates of both Eclipse - immediately after March and September releases.

(3) BETA_JAVAn will continue to be available as a Patch on March and September releases of Eclipse - Hence again it is required that the BETA_JAVAn is in sync with master for a smooth patch update.

@Dani:
I would recommend the following strategy for JDT:
1) author merging the massive changes first into master
2) then the author himself creating a gerrit (after conflict resolutions, if any) for the BETA_JAVAn branch.
3) One of the committers working on the BETA_JAVAn branch can commit in the next merge from master to BETA_JAVAn

We can start with this strategy and see how it goes, and then change accordingly.

Regards,
Manoj.


Inactive hide details for Lars Vogel ---06/20/2019 09:12:13 PM---What is the merge strategy in JDT? Do they merge master into tLars Vogel ---06/20/2019 09:12:13 PM---What is the merge strategy in JDT? Do they merge master into the feature branch on a regular basis?

From: Lars Vogel <lars.vogel@xxxxxxxxxxx>
To: eclipse-pmc@xxxxxxxxxxx
Date: 06/20/2019 09:12 PM
Subject: [EXTERNAL] Re: [eclipse-pmc] Review of mass changes
Sent by: eclipse-pmc-bounces@xxxxxxxxxxx





What is the merge strategy in JDT? Do they merge master into the feature branch on a regular basis?

Daniel Megert <daniel_megert@xxxxxxxxxx> schrieb am Do., 20. Juni 2019, 17:21: