Sorry just reread your plan. I'd recommend you merge all the active branches, including 3.5. You'll thank me later :).
Sent from my BlackBerry Z30. Original Message From: Doug Schaefer Sent: Saturday, December 21, 2013 2:32 PM To: wtp-dev@eclipse.org Reply To: General discussion of project-wide or architectural issues. Subject: Re: [wtp-dev] Action Required on the issue: Bug 424538 - Make some branches read-only BTW, I'm not sure why you're asking to make branches read only. From what I saw there aren't a lot of active committers. You could just tell them not to. And I'm not even sure it's possible to make branches read only in git. Sent from my BlackBerry Z30. Original Message From: Doug Schaefer Sent: Saturday, December 21, 2013 2:24 PM To: wtp-dev@eclipse.org Reply To: General discussion of project-wide or architectural issues. Subject: Re: [wtp-dev] Action Required on the issue: Bug 424538 - Make some branches read-only There are techniques to do that. I went through that earlier this year. I can't remember exactly but it involved a merge tree operation. A Google search will find it for you. Sent from my BlackBerry Z30 smartphone. Original Message From: Max Andersen Sent: Saturday, December 21, 2013 1:50 PM To: General discussion of project-wide or architectural issues. Reply To: General discussion of project-wide or architectural issues. Cc: wtp-dev@eclipse.org Subject: Re: [wtp-dev] Action Required on the issue: Bug 424538 - Make some branches read-only How are you doing the merge of the three repositories that will keep history ? /max (sent from my phone) > On 21/12/2013, at 11.02, Victor Rubezhny <vrubez...@exadel.com> wrote: > > Doug, > > It's not published yet, but discussed in BugZilla issue #424210 - Simplify > Git repositories: https://bugs.eclipse.org/bugs/show_bug.cgi?id=424210. > > The plan of simplifying of Git repositories is simple: > > 1. We are going to merge the content of master branches of > webtools.jsdt.debug and webtools.jsdt.tests repositories into > webtools.jsdt.core's master branch. All the history/tags for master branches > of those two repositories are to be saved in webtools.jsdt.core, so, no > history is to be lost. The master branches of webtools.jsdt.debug and > webtools.jsdt.tests repositories will be closed for write, so all new > development on master will be able only in webtools.jsdt.core's master. > 2. Maintenance (like R3_5_maintenance) branches are to stay in the current > repositories with all their history. So not a change will happen to > maintenance branches and their history. webtools.jsdt.debug and > webtools.jsdt.tests repositories will stay as is (but with read-only masters) > until the finish of the maintenance. After the maintenance is finished (is > suppose when wtp 3.5.x maintenance will be finished) webtools.jsdt.debug > webtools.jsdt.tests repositories will be archived. > 3. Any new maintenance is to go into the merged webtools.jsdt.core > repository. So this repository is to be the single storage for all the > current development and any new maintenance. > > Also, there is a plan to rename webtools.jsdt.core repository to > webtools.jsdt due to finally simplify its name ('case it's not logical to > have ".core" and not to have ".ui"). If such a rename is to happen, of > course, all the history should be saved in repository. > > Time line: As you can see there is at least two stages: > 1. Immediately: Merging master branches into one single repository; > 2. Upon completing the first stage: Renaming the webtools.jsdt.core to > webtools.jsdt. > 3. Upon completing the all current maintenance (including R3_5_maintenance): > Archiving webtools.jsdt.debug and webtools.jsdt.tests repositories, plus > archiving webtools.jsdt.core (if we'll actually copy its content into > webtools.jsdt instead of just renaming due to save all the history of the > project repositories). > > That's it. > > Any suggestions are very appreciated. > Victor > > >> On 12/21/2013 09:23 AM, Doug Schaefer wrote: >> You're merging repos? That's good news. What is the plan around that? Sorry >> if I subscribed to this list after it was published. >> >> Thanks, >> Doug >> >> Sent from my BlackBerry Z30 smartphone. >> Original Message >> From: Victor Rubezhny >> Sent: Friday, December 20, 2013 2:32 PM >> To: wtp-dev@eclipse.org; Christopher Jaun >> Reply To: General discussion of project-wide or architectural issues. >> Subject: [wtp-dev] Action Required on the issue: Bug 424538 - Make some >> branches read-only >> >> >> Chris, >> >> In order to resolve Bug #424210 (Simplify Git repositories, >> https://bugs.eclipse.org/bugs/show_bug.cgi?id=424210), we have to make >> 'master' branches to be read-only for the following repositories: >> >> - webtools.jsdt.debug >> - webtools.jsdt.tests >> >> before we could merge them into webtools.jsdt.core repository. >> >> This should be done due to prevent pushing the commits to these >> repositories thus making the only webtools.jsdt.core repository to be >> the single storage for all the JSDT projects. >> >> So, the new issue is created for this: Bug #424538 (Make some branches >> read-only, https://bugs.eclipse.org/bugs/show_bug.cgi?id=424538), and >> this is the only issue blocking us to resolve Bug #424210 >> (https://bugs.eclipse.org/bugs/show_bug.cgi?id=424210). >> >> A "+1" is required from you (as JSDT Project Lead) on Bug #424538 >> (https://bugs.eclipse.org/bugs/show_bug.cgi?id=424538) due to make >> Eclipse Webmaster to start resolving the issue which is the only issue >> blocking us to resolve Bug #424210 >> (https://bugs.eclipse.org/bugs/show_bug.cgi?id=424210). >> >> Best Regards and Happy Holidays. >> Victor Rubezhny >> _______________________________________________ >> wtp-dev mailing list >> wtp-dev@eclipse.org >> https://dev.eclipse.org/mailman/listinfo/wtp-dev >> _______________________________________________ >> wtp-dev mailing list >> wtp-dev@eclipse.org >> https://dev.eclipse.org/mailman/listinfo/wtp-dev > > _______________________________________________ > wtp-dev mailing list > wtp-dev@eclipse.org > https://dev.eclipse.org/mailman/listinfo/wtp-dev _______________________________________________ wtp-dev mailing list wtp-dev@eclipse.org https://dev.eclipse.org/mailman/listinfo/wtp-dev _______________________________________________ wtp-dev mailing list wtp-dev@eclipse.org https://dev.eclipse.org/mailman/listinfo/wtp-dev _______________________________________________ wtp-dev mailing list wtp-dev@eclipse.org https://dev.eclipse.org/mailman/listinfo/wtp-dev _______________________________________________ wtp-dev mailing list wtp-dev@eclipse.org https://dev.eclipse.org/mailman/listinfo/wtp-dev
