From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adolf Belka To: development@lists.ipfire.org Subject: Re: Temporary branch for patches intended to go into Core Update 162 Date: Fri, 19 Nov 2021 16:43:24 +0100 Message-ID: <8cc5ed27-8c1c-a097-7dda-a4ac16183d7a@ipfire.org> In-Reply-To: <7d8056e0-1f1a-50cd-14d4-95333f541934@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0679974505108282158==" List-Id: --===============0679974505108282158== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi Peter, On 19/11/2021 14:54, Adolf Belka wrote: > Hi Peter, > > On 19/11/2021 07:44, Peter M=C3=BCller wrote: >> Good morning Arne, >> good morning folks, >> >> as discussed at the latest monthly conference=20 >> (https://wiki.ipfire.org/devel/telco/2021-11-01) and >> on the phone a few weeks ago, I just wanted to inform everyone about=20 >> the current state of affairs >> of handling patches: >> >> To shed some load from Arne, who is currently mastering Core Updates,=20 >> we agreed on me opening up >> a temporary branch (ad-hoc named "temp-cXXX-development", where XXX=20 >> stands for the number of the >> upcoming Core Update in question) in my Git repository for IPFire=20 >> 2.x. There, I will apply patches >> being ready to go into the distribution, so whoever is in charge of=20 >> an update can eventually merge >> this branch. >> >> I will subsequently eat through Patchwork, starting with the most=20 >> recent patches. Additional commits >> required (for example, for shipping rootfiles) will be made if possible. >> >> @Arne: Please find the branch for Core Update 162 here:=20 >> https://git.ipfire.org/?p=3Dpeople/pmueller/ipfire-2.x.git;a=3Dshortlog;h= =3Drefs/heads/temp-c162-development >> Let me know if there is anything wrong or dissatisfying, or some=20 >> patches need to be reverted due >> to an update becoming too big. Currently being on the go, it does not=20 >> contain much yet, but you'll >> get the idea. >> >> @All: Unfortunately, I lack permissions in Patchwork to mark other=20 >> people's patches as being >> superseded (@Michael: Can/should we change this?), should I become=20 >> aware of them. As always, it >> would be a great help if everyone would periodically review his/her=20 >> Patchwork list, and scrub >> orphaned/dropped/rejected/superseded patches from it. > > Have done a first pass through patchwork to clean up my patches. When=20 > I get back from visiting my Sister I will go and finish everything off=20 > so it is all up to date. > Have actually managed a further update trawl through patchwork while I=20 am at my sisters. One question I have. In the past patches changed from new to staged when=20 they were merged into next. Now with the temp branch do we count it as=20 staged in patchwork when the patch has been merged into that branch or=20 should we wait until the temp branch is merged into next? I have some patches that are now merged into the temp branch but not yet=20 into next. Currently I am still leaving them as status New. Regards, Adolf. > Regards, > > Adolf. > >> As always, please drop me a line in case of questions or comments. >> >> Thanks, and best regards, >> Peter M=C3=BCller > --=20 Sent from my laptop --===============0679974505108282158==--