Re: Undo squashed commits
Apologies for doing it incorrectly, it's just the way I've been doing it all along. Agree with the idea of the committer committing her/his own work rather than someone else. Gj On Thu, Jun 28, 2018 at 7:08 AM, Matthias Bläsing wrote: > Hey, > > in theory you could rewrite history and force push an update, but that > will break all commits on top of that. > > I would create a revert patch, that restores the branch to its previuos > state. History looks a bit more complicated after that, but that should not > break others work. > > In general I would prefer if a committer commits bis work himself. He > knows besteht how to handle it. Squash-and-merge is IMHO for corner cases > and not for general usw. > > Matthias > > Am 28. Juni 2018 05:20:14 MESZ schrieb Junichi Yamamoto < > junichi0...@gmail.com>: > >Hi, > > > >My backport of fixes made after Apr 22, 2017 was merged into > >2ndDonation branch[1]. However, it was squashed. I think that we > >should not squash it. > > > >Can someone undo this? > > > >[1] https://github.com/apache/incubator-netbeans/pull/607 > > > >Thanks, > >Junichi > > > >- > >To unsubscribe, e-mail: dev-unsubscr...@netbeans.incubator.apache.org > >For additional commands, e-mail: dev-h...@netbeans.incubator.apache.org > > > >For further information about the NetBeans mailing lists, visit: > >https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists > > -- > Diese Nachricht wurde von meinem Android-Mobiltelefon mit K-9 Mail > gesendet.
Re: Undo squashed commits
Hey, in theory you could rewrite history and force push an update, but that will break all commits on top of that. I would create a revert patch, that restores the branch to its previuos state. History looks a bit more complicated after that, but that should not break others work. In general I would prefer if a committer commits bis work himself. He knows besteht how to handle it. Squash-and-merge is IMHO for corner cases and not for general usw. Matthias Am 28. Juni 2018 05:20:14 MESZ schrieb Junichi Yamamoto : >Hi, > >My backport of fixes made after Apr 22, 2017 was merged into >2ndDonation branch[1]. However, it was squashed. I think that we >should not squash it. > >Can someone undo this? > >[1] https://github.com/apache/incubator-netbeans/pull/607 > >Thanks, >Junichi > >- >To unsubscribe, e-mail: dev-unsubscr...@netbeans.incubator.apache.org >For additional commands, e-mail: dev-h...@netbeans.incubator.apache.org > >For further information about the NetBeans mailing lists, visit: >https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists -- Diese Nachricht wurde von meinem Android-Mobiltelefon mit K-9 Mail gesendet.
Undo squashed commits
Hi, My backport of fixes made after Apr 22, 2017 was merged into 2ndDonation branch[1]. However, it was squashed. I think that we should not squash it. Can someone undo this? [1] https://github.com/apache/incubator-netbeans/pull/607 Thanks, Junichi - To unsubscribe, e-mail: dev-unsubscr...@netbeans.incubator.apache.org For additional commands, e-mail: dev-h...@netbeans.incubator.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[DISCUSS] July 2018 Apache Incubator Podling report includes NetBeans
Hi all, The time has come to provide content for the incubator podling report and I have added some notes in it as a starting point: https://wiki.apache.org/incubator/July2018 Compare the above to the last two, i.e., this needs to be done every 4 months: https://wiki.apache.org/incubator/April2018 https://wiki.apache.org/incubator/January2018 Any other items to be added -- apologies in advance for my forgetfulness in relation to anything not added yet. Thanks, Gj
Podling Report Reminder - July 2018
Dear podling, This email was sent by an automated system on behalf of the Apache Incubator PMC. It is an initial reminder to give you plenty of time to prepare your quarterly board report. The board meeting is scheduled for Wed, 18 July 2018, 10:30 am PDT. The report for your podling will form a part of the Incubator PMC report. The Incubator PMC requires your report to be submitted 2 weeks before the board meeting, to allow sufficient time for review and submission (Wed, July 04). Please submit your report with sufficient time to allow the Incubator PMC, and subsequently board members to review and digest. Again, the very latest you should submit your report is 2 weeks prior to the board meeting. Candidate names should not be made public before people are actually elected, so please do not include the names of potential committers or PPMC members in your report. Thanks, The Apache Incubator PMC Submitting your Report -- Your report should contain the following: * Your project name * A brief description of your project, which assumes no knowledge of the project or necessarily of its field * A list of the three most important issues to address in the move towards graduation. * Any issues that the Incubator PMC or ASF Board might wish/need to be aware of * How has the community developed since the last report * How has the project developed since the last report. * How does the podling rate their own maturity. This should be appended to the Incubator Wiki page at: https://wiki.apache.org/incubator/July2018 Note: This is manually populated. You may need to wait a little before this page is created from a template. Mentors --- Mentors should review reports for their project(s) and sign them off on the Incubator wiki page. Signing off reports shows that you are following the project - projects that are not signed may raise alarms for the Incubator PMC. Incubator PMC - To unsubscribe, e-mail: dev-unsubscr...@netbeans.incubator.apache.org For additional commands, e-mail: dev-h...@netbeans.incubator.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: [DISCUSS] Merging back netcat@ into the dev@ mailing list
On Wed, Jun 27, 2018 at 4:44 PM, Brett Ryan wrote: > My plan is for a lot of my devs and test teams to come join NetCAT, most > of my QA team do not have an engineering background and for them they > wouldn’t want to see dev related topics. > Now that's an awesome plan! Gj > > You’re all doing great work here. > > > On 27 Jun 2018, at 22:03, Geertjan Wielenga > wrote: > > > > Whatever keeps Luca and all other NetCAT people inspired and on board is > > what we should do. > > > > I frankly don’t understand what the problem is that we’re trying to fix > > here. If we’re saying that we’re not able to communicate with the whole > > community because we have NetCAT separated from dev, then we should use > the > > same argument consistently and merge the users mailing list into dev as > > well and I’m sure no one is suggesting that. :-) > > > > Apache NetBeans has a community of users, developers, and testers. > That's a > > value add, if anything. > > > > Gj > > > > > > > > On Wednesday, June 27, 2018, Bertrand Delacretaz > > > wrote: > > > >> Hi, > >> > >> On Wed, Jun 27, 2018 at 9:34 AM Luca Mambretti > >> wrote: > >>> ...During the previous programs there were weekly reports on > activities, > >> measurement on traffic > >>> on the mailing list and various surveys to check the status of the > >> release train in the allotted > >>> time-frame; ... > >> > >> I know little about how NetCAT works but from an Apache perspective of > >> asynchronous collaboration, jira tickets might be a good way to > >> coordinate the NetCAT reviews: create a ticket for each main part of > >> the review (per-tribe?), people can create sub-tickets for more fine > >> grained coordination and it's easy to get an overview on activity and > >> status via jira queries. And NetCAT jira tickets can be linked to > >> development tickets which can help make both teams feel more united. > >> > >> Apache projects rarely have set deadlines for releases, as those can > >> go against quality and people usually work on their own schedule as > >> opposed to being paid to do things on time. Such loose but efficient > >> coordination mechanisms work very well for that and quality as opposed > >> to artificial deadlines then drive the releases. > >> > >> This is just my 2 cents, as mentioned I know little about NetCAT, but > >> I do know a bit about how things work in loosely coupled Apache > >> projects, and I feel that Apache NetBeans is getting more loosely > >> coupled - which does have advantages but might require some > >> adjustments. > >> > >> -Bertrand (NetBeans incubation mentor) > >> > >> - > >> To unsubscribe, e-mail: netcat-unsubscr...@netbeans.apache.org > >> For additional commands, e-mail: netcat-h...@netbeans.apache.org > >> > >> For further information about the NetBeans mailing lists, visit: > >> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists > >> > >> > > - > To unsubscribe, e-mail: netcat-unsubscr...@netbeans.apache.org > For additional commands, e-mail: netcat-h...@netbeans.apache.org > > For further information about the NetBeans mailing lists, visit: > https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists > >
Re: [DISCUSS] Merging back netcat@ into the dev@ mailing list
I wasn’t going to say anything but my sentiment is the same. We’ve functioned very well this way for a long time, and nothing is broken. There is a lot of work to be done with the transition, lets focus on what is important. I have been fairly quiet lately due to a new role in BigData and time constraints. I will likely be helping out a lot more in the future and am presently getting wider adoption in our CTO. My plan is for a lot of my devs and test teams to come join NetCAT, most of my QA team do not have an engineering background and for them they wouldn’t want to see dev related topics. You’re all doing great work here. > On 27 Jun 2018, at 22:03, Geertjan Wielenga > wrote: > > Whatever keeps Luca and all other NetCAT people inspired and on board is > what we should do. > > I frankly don’t understand what the problem is that we’re trying to fix > here. If we’re saying that we’re not able to communicate with the whole > community because we have NetCAT separated from dev, then we should use the > same argument consistently and merge the users mailing list into dev as > well and I’m sure no one is suggesting that. :-) > > Apache NetBeans has a community of users, developers, and testers. That's a > value add, if anything. > > Gj > > > > On Wednesday, June 27, 2018, Bertrand Delacretaz > wrote: > >> Hi, >> >> On Wed, Jun 27, 2018 at 9:34 AM Luca Mambretti >> wrote: >>> ...During the previous programs there were weekly reports on activities, >> measurement on traffic >>> on the mailing list and various surveys to check the status of the >> release train in the allotted >>> time-frame; ... >> >> I know little about how NetCAT works but from an Apache perspective of >> asynchronous collaboration, jira tickets might be a good way to >> coordinate the NetCAT reviews: create a ticket for each main part of >> the review (per-tribe?), people can create sub-tickets for more fine >> grained coordination and it's easy to get an overview on activity and >> status via jira queries. And NetCAT jira tickets can be linked to >> development tickets which can help make both teams feel more united. >> >> Apache projects rarely have set deadlines for releases, as those can >> go against quality and people usually work on their own schedule as >> opposed to being paid to do things on time. Such loose but efficient >> coordination mechanisms work very well for that and quality as opposed >> to artificial deadlines then drive the releases. >> >> This is just my 2 cents, as mentioned I know little about NetCAT, but >> I do know a bit about how things work in loosely coupled Apache >> projects, and I feel that Apache NetBeans is getting more loosely >> coupled - which does have advantages but might require some >> adjustments. >> >> -Bertrand (NetBeans incubation mentor) >> >> - >> To unsubscribe, e-mail: netcat-unsubscr...@netbeans.apache.org >> For additional commands, e-mail: netcat-h...@netbeans.apache.org >> >> For further information about the NetBeans mailing lists, visit: >> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists >> >> - To unsubscribe, e-mail: dev-unsubscr...@netbeans.incubator.apache.org For additional commands, e-mail: dev-h...@netbeans.incubator.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: [DISCUSS] Merging back netcat@ into the dev@ mailing list
Why not wait with merging plans? Speaking as an emeritus PMC member i would have been very greatfull if there was a specialized testing community. So why not help them with filtering out the traffic from developers, by providing them with a separate mailinglist? A CC: to netcat would suffice to signal important issues. If they want they can subscribe to dev as well. If it turns out in 6 months that all netcat members are also subscribed to dev, we can shutdown the netcat list. G. Simon -- QCG, Software development, 071-5890970, http://www.qcg.nl Quality Consultancy Group b.v., Leiderdorp, Kvk Den Haag: 28088397 - To unsubscribe, e-mail: dev-unsubscr...@netbeans.incubator.apache.org For additional commands, e-mail: dev-h...@netbeans.incubator.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: [DISCUSS] Merging back netcat@ into the dev@ mailing list
As a NetCat member I've felt a decrease of focus and attention, most probably due to other issues eating up all the available coordinating resources, maybe this is also the reason of the currently low traffic as most of the participants in NetCat 9.0 already moved on to other things, (NetCat as always been a timeboxed effort). But In my opinion this goes way beyond a simple merge of the 2 lists. During the previous programs there were weekly reports on activities, measurement on traffic on the mailing list and various surveys to check the status of the release train in the allotted time-frame; in this version most of the time frames were blown and, as a consequence, most of the reporting and organization was blown as well, that is my own personal opinion. I'm fairly sure these things might be, and probably should be reorganized to be more in line with apache policies, but I still feel the "Oracle sponsored" organization model has it's benefits, again in my opinion testing and development should be considered separate things as different issues and most importantly a different type of involvement are in play. For myself I do not have the time to be fully involved in development, although I'd love to, but I do have time-frames when I can do testing, the NetCat model "oracle style" was thus very appealing to me, on the contrary having to move everything to development, has a negative feel, again my personal opinion. It might work out in my case if the original time-frames and release based NetCat organization manages to stay, as I might be here for 9.0 but might not be here for 9.1, so assuming I still have the option to register for NetCat if I have time, or opt out if I do not, I would not care that much if communications go thou dev or a dedicated list. the risk I see here is that some part of NetCat has always been composed of people like me, so if moving to dev and reorganizing means that I'll feel compelled to put in more time then I might just opt out completely instead. I do not mean to criticize in any way how thing have been managed, I know changing everything is hard, I just wanted to point out a potentially different point of view, so that it gets considered. Regards, Luca. - Messaggio originale - Da: "Antonio" A: "dev" Cc: "netcat" Inviato: Mercoledì, 27 giugno 2018 8:03:47 Oggetto: Re: [DISCUSS] Merging back netcat@ into the dev@ mailing list On 26/06/18 13:47, Emilian Bold wrote: > > I think this further proves it's a bad idea to have multiple mailing lists. > We aren't even capable of having a discussion involving the whole community! Good point! > [...] > But the Apache move is not a small thing and NetCAT should also adapt. If > anything, NetCAT's role might be better than ever, but we have to discuss > about this first. > This is also a good point. NetCAT is probably more important now than ever. Cheers, Antonio - To unsubscribe, e-mail: netcat-unsubscr...@netbeans.apache.org For additional commands, e-mail: netcat-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists - To unsubscribe, e-mail: dev-unsubscr...@netbeans.incubator.apache.org For additional commands, e-mail: dev-h...@netbeans.incubator.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: [DISCUSS] Merging back netcat@ into the dev@ mailing list
Whatever keeps Luca and all other NetCAT people inspired and on board is what we should do. I frankly don’t understand what the problem is that we’re trying to fix here. If we’re saying that we’re not able to communicate with the whole community because we have NetCAT separated from dev, then we should use the same argument consistently and merge the users mailing list into dev as well and I’m sure no one is suggesting that. :-) Apache NetBeans has a community of users, developers, and testers. That's a value add, if anything. Gj On Wednesday, June 27, 2018, Bertrand Delacretaz wrote: > Hi, > > On Wed, Jun 27, 2018 at 9:34 AM Luca Mambretti > wrote: > > ...During the previous programs there were weekly reports on activities, > measurement on traffic > > on the mailing list and various surveys to check the status of the > release train in the allotted > > time-frame; ... > > I know little about how NetCAT works but from an Apache perspective of > asynchronous collaboration, jira tickets might be a good way to > coordinate the NetCAT reviews: create a ticket for each main part of > the review (per-tribe?), people can create sub-tickets for more fine > grained coordination and it's easy to get an overview on activity and > status via jira queries. And NetCAT jira tickets can be linked to > development tickets which can help make both teams feel more united. > > Apache projects rarely have set deadlines for releases, as those can > go against quality and people usually work on their own schedule as > opposed to being paid to do things on time. Such loose but efficient > coordination mechanisms work very well for that and quality as opposed > to artificial deadlines then drive the releases. > > This is just my 2 cents, as mentioned I know little about NetCAT, but > I do know a bit about how things work in loosely coupled Apache > projects, and I feel that Apache NetBeans is getting more loosely > coupled - which does have advantages but might require some > adjustments. > > -Bertrand (NetBeans incubation mentor) > > - > To unsubscribe, e-mail: netcat-unsubscr...@netbeans.apache.org > For additional commands, e-mail: netcat-h...@netbeans.apache.org > > For further information about the NetBeans mailing lists, visit: > https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists > >
loader constraint violation in maven plugin project
Hello, in a maven plugin project, I get the following LinkageError in JavaTreeBuilder: "loader constraint violation: loader (instance of org/netbeans/StandardModule$OneModuleClassLoader) previously initiated loading for a different type with name "javax/lang/model/util/Elements"" My guess is, the class has already been loaded as part of NetBeans, and it is loaded a second time when executing the plugin. The project is at github (https://github.com/OldGrumble/NBWicketSupport), for testing I'm using branch "issue-2". I added some extra lines to JavaTreeBuilder.java for easier error catching, You can set a breakpoint in line 139 of JavaTreeBuilder for looking at the exception. The demo project I'm using is added to the branch in src/main/resources/demo. Workflow: 1. Open Project. 2. Open CustomerTestPage.java. 3. Open CustomerTestPage.html. 4. An exception dialog pops up ("Unexpected Exception"). Probably it's important: Using NB 8.2 with JDK 1.8 on Linux. Any help appreciated. Kind regards Peter - To unsubscribe, e-mail: dev-unsubscr...@netbeans.incubator.apache.org For additional commands, e-mail: dev-h...@netbeans.incubator.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: [DISCUSS] Merging back netcat@ into the dev@ mailing list
Hi, On Wed, Jun 27, 2018 at 9:34 AM Luca Mambretti wrote: > ...During the previous programs there were weekly reports on activities, > measurement on traffic > on the mailing list and various surveys to check the status of the release > train in the allotted > time-frame; ... I know little about how NetCAT works but from an Apache perspective of asynchronous collaboration, jira tickets might be a good way to coordinate the NetCAT reviews: create a ticket for each main part of the review (per-tribe?), people can create sub-tickets for more fine grained coordination and it's easy to get an overview on activity and status via jira queries. And NetCAT jira tickets can be linked to development tickets which can help make both teams feel more united. Apache projects rarely have set deadlines for releases, as those can go against quality and people usually work on their own schedule as opposed to being paid to do things on time. Such loose but efficient coordination mechanisms work very well for that and quality as opposed to artificial deadlines then drive the releases. This is just my 2 cents, as mentioned I know little about NetCAT, but I do know a bit about how things work in loosely coupled Apache projects, and I feel that Apache NetBeans is getting more loosely coupled - which does have advantages but might require some adjustments. -Bertrand (NetBeans incubation mentor) - To unsubscribe, e-mail: dev-unsubscr...@netbeans.incubator.apache.org For additional commands, e-mail: dev-h...@netbeans.incubator.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: [DISCUSS] Proposed Release ProcessWAS: Merging back netcat@ into the dev@ mailing list
I'd personally prefer faster releases (i.e. 3 months or so). I'd suggest to try to minimize cherry-picking/backporting. One possible way is to have a window for merging features, and then only do stabilization/bugfixes in master for some time, and only then (closer to the release) do a branch, and only cherry-pick a limited # of changes. I believe this is the approach that has been used in NetBeans for quite some time, and, to me, it seemed to work fairly well. I believe the branching occurred a months (or so) before the release, but I may be wrong on that. But it surely is not the only process we could follow. Jan On Tue, Jun 26, 2018 at 6:01 PM, Neil C Smith wrote: > On Tue, 26 Jun 2018 at 13:34, John McDonnell > wrote: > > > > Might every 3 months be pushing it a little? > > > > We'll constantly be in a state of picking fixes for release -> testing -> > > fixing -> release -> picking fixes for release, etc.. > > > > Something like 6 months is a little more relaxed as it gives us about 4 > > months between releases to make changes, introduce new features to the > IDE, > > without rushing. > > Funnily enough, my view is that 3 months would be more relaxed, > because there's less stress to rush a new feature if it's not ready > when there's a new release cycle imminent. Likewise, this was > suggested on the basis of master being kept relatively stable, with > new features mainly being developed in branches until they're ready > for wider testing. With cherry-picking of changes from master into > the release branch (like is happening now), I don't see why all these > things cannot happen in parallel. A bit more Release Early, Release > Often, with some NetCAT still in the mix! ;-) > > I think I'm up to 4c. > > Best wishes, > > Neil > > - > To unsubscribe, e-mail: dev-unsubscr...@netbeans.incubator.apache.org > For additional commands, e-mail: dev-h...@netbeans.incubator.apache.org > > For further information about the NetBeans mailing lists, visit: > https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists > > > >
Re: [DISCUSS] Merging back netcat@ into the dev@ mailing list
On 26/06/18 13:47, Emilian Bold wrote: I think this further proves it's a bad idea to have multiple mailing lists. We aren't even capable of having a discussion involving the whole community! Good point! [...] But the Apache move is not a small thing and NetCAT should also adapt. If anything, NetCAT's role might be better than ever, but we have to discuss about this first. This is also a good point. NetCAT is probably more important now than ever. Cheers, Antonio - To unsubscribe, e-mail: dev-unsubscr...@netbeans.incubator.apache.org For additional commands, e-mail: dev-h...@netbeans.incubator.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists