From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adolf Belka To: development@lists.ipfire.org Subject: Re: Need to revert a commit in temp-CU164 Date: Mon, 24 Jan 2022 12:28:26 +0100 Message-ID: In-Reply-To: <6B7D0FA9-4533-4AE2-AE05-74FCE2C487A6@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0304327996371223992==" List-Id: --===============0304327996371223992== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi Michael, On 24/01/2022 12:13, Michael Tremer wrote: > Hello Adolf, >=20 > You can just revert this commit in your local branch. That is probably easi= est. The commit is not in my local branch. Whenever I do an update I always do it = in a branch which is based on the current status of next. So as next does not= yet have that patch merged from the temp-cu164 branch of Peter, then it is a= lso not in my python3.10 branch. Maybe I am not using the git branches the way I should be but that is what I = have been doing to date. Regards, Adolf. >=20 > -Michael >=20 >> On 24 Jan 2022, at 09:46, Adolf Belka wrote: >> >> Hi Peter, >> >> I saw that you merged I patch I did some time ago for the update of python= s-setuptools from version 56.2.0 to 58.0.4 >> >> I have been working on the python3 upgrade from 3.8 to 3.10 and with this = I am also updating the various python modules that are out of date. >> >> >> I had forgotten that I had done that patch so my python3 series build is a= lso updating python3-setuptools from 56.2.0 to 59.5.0 >> >> I would appreciate it if you could revert my patch https://git.ipfire.org/= ?p=3Dpeople/pmueller/ipfire-2.x.git;a=3Dcommit;h=3Dc2539fe22eb32dee82e378f2b8= de60dd16491362 otherwise I will need to start all over again for the third ti= me with my python3 branch build. >> >> >> Thanks very much and regards, >> >> Adolf. >> >=20 --===============0304327996371223992==--