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 13:42:38 +0100 Message-ID: <65a0758b-b077-da87-f6a6-48e9090b406a@ipfire.org> In-Reply-To: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0448451958761191165==" List-Id: --===============0448451958761191165== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi Michael, On 24/01/2022 12:37, Michael Tremer wrote: > Hello Adolf, >=20 >> On 24 Jan 2022, at 11:28, Adolf Belka wrote: >> >> Hi Michael, >> >> On 24/01/2022 12:13, Michael Tremer wrote: >>> Hello Adolf, >>> You can just revert this commit in your local branch. That is probably ea= siest. >> 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 i= s also 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. >=20 > Then I do not understand :) >=20 > Are you trying to rebase your Python 3.10 branch on next? I am not trying to rebase it. It is based on next. I have done an update in t= hat branch of python3-setuptools from 56.2.0 to 59.5.0 If that branch was merged today then it would be fine. However if the earlier= patch of python3-setuptools that is in Peter's temp branch gets merged into = next first then python3-setuptools in next will be at version 58.0.4 I would expect that if my python3 branch was merged after that there would be= a problem with the patch that would be trying to update python3-setuptools f= rom 56.2.0 to 59.5.0 because python3-setuptools would be at version 58.0.4 >=20 > -Michael Regards, Adolf. >=20 >> >> Regards, >> Adolf. >>> -Michael >>>> 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 pyth= ons-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 thi= s 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= also updating python3-setuptools from 56.2.0 to 59.5.0 >>>> >>>> I would appreciate it if you could revert my patch https://git.ipfire.or= g/?p=3Dpeople/pmueller/ipfire-2.x.git;a=3Dcommit;h=3Dc2539fe22eb32dee82e378f2= b8de60dd16491362 otherwise I will need to start all over again for the third = time with my python3 branch build. >>>> >>>> >>>> Thanks very much and regards, >>>> >>>> Adolf. >>>> >=20 --===============0448451958761191165==--