I merged all release branches into master with the ‘ours’ strategy, which means that future merges won’t include the release-specific changes such as versions and upstream branches. Now you can commit directly to the release branch if you have something to fix for the release, and those changes will be merged into master just before the release. The advantage of this approach is that no cherry-picking is necessary, which duplicates commits and is easy to forget.
We’ll use the same approach for the maintenance_2.11 branch after the release, and also for all following maintenance branches. Miro > On 18 Jan 2017, at 11:18, Miro Spönemann <[email protected]> wrote: > > Hi, > > the 2.11.0.RC1 milestone is published. We should use this one for testing the > upcoming 2.11.0 release. > > I propose the following approach for continuing work on Xtext: > > * I’ll create “release_2.11.0” branches on all repositories, from which the > release will be built in two weeks. All changes (important bugfixes) that > should be included in the release need to be cherry-picked onto these > branches. > > * I’ll switch the “master” branches to 2.12.0-SNAPSHOT. > > * When the release is done, I’ll create “maintenance_2.11” branches from > which we can derive maintenance releases (2.11.1 etc.) > > Cheers > Miro > > >> On 17 Jan 2017, at 15:19, Sven Efftinge <[email protected] >> <mailto:[email protected]>> wrote: >> >> Hi all, >> >> when scheduling the release review I overlooked a message on the top of the >> website asking me to additionally send a mail to the emo. >> I did that only today, but due to fixed release review dates the emo pushed >> the release date to February 1st. >> Sorry for that. >> >> Regards, >> Sven >> >> 2017-01-03 17:03 GMT+01:00 Miro Spönemann <[email protected] >> <mailto:[email protected]>>: >> I can take care of the Eclipse Help, created eclipse/xtext-eclipse#149 for >> that. >> >> I removed some issues from the 2.11 milestone on GitHub since nobody seemed >> to work on them. In particular, I removed all xtext-idea issues: I don’t >> believe we’ll be able to bring the IDEA integration into a proper state >> within the next few weeks, so quite probably we’ll have to drop the 2.11 >> release for xtext-idea. >> >> The remaining issues are listed here: >> >> https://github.com/search?o=asc&q=is%3Aissue+milestone%3Arelease_v2.11+is%3Aopen+repo%3Aeclipse%2Fxtext+repo%3Aeclipse%2Fxtext-core+repo%3Aeclipse%2Fxtext-lib+repo%3Aeclipse%2Fxtext-extras+repo%3Aeclipse%2Fxtext-eclipse+repo%3Aeclipse%2Fxtext-idea+repo%3Aeclipse%2Fxtext-web+repo%3Aeclipse%2Fxtext-maven+repo%3Aeclipse%2Fxtext-xtend&ref=searchresults&s=created&type=Issues&utf8=✓ >> >> <https://github.com/search?o=asc&q=is:issue+milestone:release_v2.11+is:open+repo:eclipse/xtext+repo:eclipse/xtext-core+repo:eclipse/xtext-lib+repo:eclipse/xtext-extras+repo:eclipse/xtext-eclipse+repo:eclipse/xtext-idea+repo:eclipse/xtext-web+repo:eclipse/xtext-maven+repo:eclipse/xtext-xtend&ref=searchresults&s=created&type=Issues&utf8=%E2%9C%93> >> >> I propose that we all keep an eye on this list to make sure it’s empty when >> the release is done (either by fixing issues or by removing them from the >> release milestone). We should also check whether there are closed issues >> that should be assigned to the release milestone so we can easily generate a >> list of fixed bugs. >> >> Cheers >> Miro >> >> >>> On 2 Jan 2017, at 15:39, Christian Dietrich <[email protected] >>> <mailto:[email protected]>> wrote: >>> >>> >>> Hi, >>> >>> Who will update the eclipse help from the website maintenance branch? >>> >>> Am 02.01.17 um 15:34 schrieb Sven Efftinge: >>>> Hi & Happy New Year to everyone, >>>> >>>> as the release date for 2.11 is approaching we need to do more testing >>>> and slow down changing the code base. >>>> >>>> I suggest to stop development of any features in our mature code base >>>> and only do fixes that obviously improve the current status quo. That >>>> means no fixes for minor problems, that could introduce major issues. >>>> >>>> Starting one week before the release (i.e. January 17th) we should only >>>> add changes for important blockers. >>>> >>>> *Testing * >>>> >>>> For testing we used to have a testing plan, where everyone is encouraged >>>> to participate and cover as much of the testing as possible. By using a >>>> plan we keep track of what has been tested and what not, avoiding >>>> duplicated efforts and missing important scenarios. >>>> >>>> https://github.com/eclipse/xtext/wiki/Xtext-2.11-Test-Plan >>>> <https://github.com/eclipse/xtext/wiki/Xtext-2.11-Test-Plan> >>>> >>>> Please feel free to add test items as you wish and test stuff that is >>>> not listed (adding it afterward would be good). >>>> >>>> *Release Notes* >>>> * >>>> * >>>> Based on Karsten's suggestion I added an initial draft for a release >>>> notes document to a new branch (website-master) on the Xtext repository. >>>> >>>> https://github.com/eclipse/xtext/tree/website-master >>>> <https://github.com/eclipse/xtext/tree/website-master> >>>> >>>> Cheers, >>>> Sven -- Dr. Miro Spönemann Software engineer and consultant TypeFox GmbH Am Germaniahafen 1, 24143 Kiel http://typefox.io Tel.: +49 151 42679459 Sitz: Kiel, Registergericht: Amtsgericht Kiel, HRB 17385 Geschäftsführer: Sven Efftinge, Dr. Jan Köhnlein, Moritz Eysholdt
_______________________________________________ xtext-dev mailing list [email protected] To change your delivery options, retrieve your password, or unsubscribe from this list, visit https://dev.eclipse.org/mailman/listinfo/xtext-dev
