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 16:38:17 +0100 Message-ID: <402951dd-d510-132d-c66f-42d3b7d74d48@ipfire.org> In-Reply-To: <3ADBDE1C-A8E6-42C6-9E21-753AA6BB1289@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0420499150789179729==" List-Id: --===============0420499150789179729== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable On 24/01/2022 15:10, Michael Tremer wrote: > Hello, >=20 >> On 24 Jan 2022, at 12:42, Adolf Belka wrote: >> >> Hi Michael, >> >> On 24/01/2022 12:37, Michael Tremer wrote: >>> Hello Adolf, >>>> 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 = easiest. >>>> The commit is not in my local branch. Whenever I do an update I always d= o it in a branch which is based on the current status of next. So as next doe= s 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 wh= at 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 i= n that 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 earl= ier patch of python3-setuptools that is in Peter's temp branch gets merged in= to 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-setuptool= s from 56.2.0 to 59.5.0 because python3-setuptools would be at version 58.0.4 >=20 > Yes, this would cause a merge conflict and git will stop and ask to resolve= the conflict. This is however very easy to resolve because only the version = and the checksum have been touched. So no need to worry about it. Okay, that is good news. I won't worry about it any more. Thanks very much, Adolf. >=20 > -Michael >=20 >>> -Michael >> Regards, >> Adolf. >>>> >>>> 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 py= thons-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 t= his 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.= org/?p=3Dpeople/pmueller/ipfire-2.x.git;a=3Dcommit;h=3Dc2539fe22eb32dee82e378= f2b8de60dd16491362 otherwise I will need to start all over again for the thir= d time with my python3 branch build. >>>>>> >>>>>> >>>>>> Thanks very much and regards, >>>>>> >>>>>> Adolf. >>>>>> >=20 --===============0420499150789179729==--