From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: Need to revert a commit in temp-CU164 Date: Mon, 24 Jan 2022 14:10:49 +0000 Message-ID: <3ADBDE1C-A8E6-42C6-9E21-753AA6BB1289@ipfire.org> In-Reply-To: <65a0758b-b077-da87-f6a6-48e9090b406a@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4695282093366173062==" List-Id: --===============4695282093366173062== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hello, > On 24 Jan 2022, at 12:42, Adolf Belka wrote: >=20 > Hi Michael, >=20 > On 24/01/2022 12:37, Michael Tremer wrote: >> Hello Adolf, >>> On 24 Jan 2022, at 11:28, Adolf Belka wrote: >>>=20 >>> Hi Michael, >>>=20 >>> On 24/01/2022 12:13, Michael Tremer wrote: >>>> Hello Adolf, >>>> You can just revert this commit in your local branch. That is probably e= asiest. >>> 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 also not in my python3.10 branch. >>> Maybe I am not using the git branches the way I should be but that is wha= t I have been doing to date. >> Then I do not understand :) >> 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= that branch of python3-setuptools from 56.2.0 to 59.5.0 >=20 > If that branch was merged today then it would be fine. However if the earli= er patch of python3-setuptools that is in Peter's temp branch gets merged int= o 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= from 56.2.0 to 59.5.0 because python3-setuptools would be at version 58.0.4 Yes, this would cause a merge conflict and git will stop and ask to resolve t= he conflict. This is however very easy to resolve because only the version an= d the checksum have been touched. So no need to worry about it. -Michael >> -Michael > Regards, > Adolf. >>>=20 >>> Regards, >>> Adolf. >>>> -Michael >>>>> On 24 Jan 2022, at 09:46, Adolf Belka wrote: >>>>>=20 >>>>> Hi Peter, >>>>>=20 >>>>> I saw that you merged I patch I did some time ago for the update of pyt= hons-setuptools from version 56.2.0 to 58.0.4 >>>>>=20 >>>>> I have been working on the python3 upgrade from 3.8 to 3.10 and with th= is I am also updating the various python modules that are out of date. >>>>>=20 >>>>>=20 >>>>> I had forgotten that I had done that patch so my python3 series build i= s also updating python3-setuptools from 56.2.0 to 59.5.0 >>>>>=20 >>>>> I would appreciate it if you could revert my patch https://git.ipfire.o= rg/?p=3Dpeople/pmueller/ipfire-2.x.git;a=3Dcommit;h=3Dc2539fe22eb32dee82e378f= 2b8de60dd16491362 otherwise I will need to start all over again for the third= time with my python3 branch build. >>>>>=20 >>>>>=20 >>>>> Thanks very much and regards, >>>>>=20 >>>>> Adolf. >>>>>=20 --===============4695282093366173062==--