From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: Need to revert a commit in temp-CU164
Date: Mon, 24 Jan 2022 11:37:52 +0000
Message-ID: <D1CFAFDE-4EE5-4D83-8A6A-16208D0836CC@ipfire.org>
In-Reply-To: <de39284a-40a3-0677-55d6-537519c2340d@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1718778151100783759=="
List-Id: <development.lists.ipfire.org>

--===============1718778151100783759==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Hello Adolf,

> On 24 Jan 2022, at 11:28, Adolf Belka <adolf.belka(a)ipfire.org> 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 eas=
iest.
> The commit is not in my local branch. Whenever I do an update I always do i=
t in a branch which is based on the current status of next. So as next does n=
ot 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 what =
I have been doing to date.

Then I do not understand :)

Are you trying to rebase your Python 3.10 branch on next?

-Michael

>=20
> Regards,
> Adolf.
>> -Michael
>>> On 24 Jan 2022, at 09:46, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>>>=20
>>> Hi Peter,
>>>=20
>>> I saw that you merged I patch I did some time ago for the update of pytho=
ns-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 this=
 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 is =
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.org=
/?p=3Dpeople/pmueller/ipfire-2.x.git;a=3Dcommit;h=3Dc2539fe22eb32dee82e378f2b=
8de60dd16491362 otherwise I will need to start all over again for the third t=
ime with my python3 branch build.
>>>=20
>>>=20
>>> Thanks very much and regards,
>>>=20
>>> Adolf.
>>>=20


--===============1718778151100783759==--