From nobody Wed Sep 04 12:28:52 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzMHH05Zrz5Tnqk; Wed, 04 Sep 2024 12:28:59 +0000 (UTC) (envelope-from mat@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WzMHG5L32z5796; Wed, 4 Sep 2024 12:28:58 +0000 (UTC) (envelope-from mat@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725452938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=i0ZEHssYrlAToh6yft46qEj50Iu/Y0Pu/UYhMqI7zVc=; b=T/Hf49PzOg7vd3DV+9ZsmSPo9434xs/Sfy8LrazcSUBu8pg4ftSIsXzpdzhkY4DRo+hH77 s34uRDSAsRjBsoLZaUd5gidsha7QzisVviB9ZLMD48Jmgw9Z8HTjK8YFp+mEwveg3U8aQR g1LLw9hSqwzy99Okc+OhPb/qIgjvWjeNV+labuXV1a/5Kk8/4NHd8AdNefoCcT2aK86ay/ 4aBdE16tU024Jqea7KBAc6FtEPrWMxgopXSMPCZF/rJaNJdwdk0wrMZY34SfjvYt8FX4Bm psjpdh8bLfGmdOWu+YxHMS5hdTs4kJZ5u9HhW2B7KTfN0Y6cij/QdhhGvKSzCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725452938; a=rsa-sha256; cv=none; b=OdKa6AT/Bb2eXToUO4j8Qk7iShRp/fnGppwY8iQXmShbEZHqHYXwcbogQKWB65KMw/UQ8/ MmOTkfR7e5u9V3XeuJC1RRRgUqlDzvwh5F6Xz2I6XHNNGGvKTD5Hl0YwAMjt1AKb26DhDO g9BzQy9WQCf9bpan8uwHNWXmRM8eM/ksmL/oA98MA/AiiRFue5MymF+0gOSbtqJqvZFYKo IjuXoVk5AAeTgRyX/GIU2PRp+Bgja4N6hooHBkTbto4nL4GzKzz1uMmLlkMDy36hOv4BGN wxtiRswBDttUirHFA9lUxF8rAuU4dYQQMEr6obKg39YL67HXX1rGAcEIrEAPsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725452938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=i0ZEHssYrlAToh6yft46qEj50Iu/Y0Pu/UYhMqI7zVc=; b=E9F72xf9mDeuYpysrCJNH4CcQXjWentl5+LP27IifrV6XQx/HP8WcAgmGcED/afRJAAHcy Jrf9GgM+1BEZMdr6ecYYq1/RJ+HtSi77bh9wv5Zo562H2tFpwrXXgw1r8Z+AfeZI7+UT83 48+VVNZL8NNzMx5MurH084pOioaBa1wP7FsQIq4bHT9kcQBkER1rLMZMSeXTy6pDR9GKT7 oWzooX/RlkIvlokf6T0Dj2snNiD7L1yaGXKnHtfJvx65uyAbO4lTSr1bmbdIYMd1lpGFMC XuaoJMH5sT09z1mVsiiAgGC3fSkOKMFtCn4RIO1Y8/5yx6Kx6fQ36GKcrj7xaA== Received: from relay.mat.cc (eqx1.mat.cc [IPv6:2a01:678:2:200::49]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "cow.mat.cc", Issuer "R10" (verified OK)) (Authenticated sender: mat/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4WzMHG2b0szNPD; Wed, 4 Sep 2024 12:28:58 +0000 (UTC) (envelope-from mat@freebsd.org) Received: from aching.in.mat.cc (unknown [IPv6:2a01:e0a:836:f670:f4c6:bdb1:18f9:70b7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by relay.mat.cc (Postfix) with ESMTPSA id 95D1520A86; Wed, 4 Sep 2024 14:28:54 +0200 (CEST) Date: Wed, 4 Sep 2024 14:28:52 +0200 From: Mathieu Arnold To: Gleb Popov Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 06757954d9e3 - main - Uses/electronfix.mk: revert previous commit Message-ID: <43f6truiktdu445ghpxvlbgpu2g37liqltnkpjpo33jcgbuty4@yulz6tjj63s3> References: <202409041000.484A0AcN013930@gitrepo.freebsd.org> List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="kohwzcydal6k6hzl" Content-Disposition: inline In-Reply-To: --kohwzcydal6k6hzl Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Sep 04, 2024 at 01:28:45PM GMT, Gleb Popov wrote: > On Wed, Sep 4, 2024 at 1:00=E2=80=AFPM Mathieu Arnold w= rote: > > > > The branch main has been updated by mat: > > > > URL: https://cgit.FreeBSD.org/ports/commit/?id=3D06757954d9e3de9472361b= 4e8db6ffb991c8dcea > > > > commit 06757954d9e3de9472361b4e8db6ffb991c8dcea > > Author: Mathieu Arnold > > AuthorDate: 2024-09-04 09:56:45 +0000 > > Commit: Mathieu Arnold > > CommitDate: 2024-09-04 09:58:07 +0000 > > > > Uses/electronfix.mk: revert previous commit > > > > And remove the offending port, it can be added back if the software= is > > updated to work with a supported electron. >=20 > But because you squashed these two changes, it can't be reverted with > a single git command. >=20 > You again not waiting a moment to let me do that myself? There are many way to revert only part of a commit... Without thinking much, I can see those ways: 1) a simple use of git revert - git revert -n - changes back the changes you don't want to revert - change files so that it builds - git commit 2) a variation - git revert - changes back the changes you don't want to revert - change files so that it builds - git commit --amend 3) use a modified patch - git show > foo.diff - change the diff to remove what you don't want in it - git apply -R foo.diff - change files so that it builds - git commit 4) change modified files - git show | git apply -R - revert whatever you don't want in - change files so that it builds - git commit 5) get files manually - git checkout ~1 - tar cf logseq.tar textproc.logseq - git checkout main - tar xf logseq.tar - rm logseq.tar - change files so that it builds - commit 6) do it manually be a bit tedious - mkdir -p mkdir -p textproc/logseq/files - for i in textproc/logseq/Makefile textproc/logseq/distinfo textproc/logse= q/files/Logseq.desktop textproc/logseq/files/Logseq.in textproc/logseq/file= s/patch-resources_app_node__modules__logseq_rsapi-linux-x64-gnu_package.jso= n textproc/logseq/pkg-descr textproc/logseq/pkg-plist ; do git show ~1:$i > $i ; done - change files so that it builds - add the port back to textproc/Makefile - git add / commit So, I am not sure what you mean by "unable to revert", all the files are in the history, you can get them back, and "revert" this to a working version of logseq. --=20 Mathieu Arnold --kohwzcydal6k6hzl Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQITBAABCgB9FiEE9XJBpJetWizkEBUef2IOCp6dQb4FAmbYUoNfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEY1 NzI0MUE0OTdBRDVBMkNFNDEwMTUxRTdGNjIwRTBBOUU5RDQxQkUACgkQf2IOCp6d Qb6RGwv/Wfl7PU/yQpz9ZaIl/DhIg7HCnBJs2wM9J9B001SDO4uLOLwaywFmgFuB SAvzTyLiv/YjzgxZpWUpQAe8v67gfj0TBgzFpKE/yWY5L6JDF+cjuChIzbe/3jEP DYmAPn+5TYDzj30nyXcEWzohcs0OBoX01xzhmTRackhl87eVMX0ycpQ1PGtsjohu 8nhQh3DTqz17gytZLV7ITe4f2QETQO6rmZmRAAtwppyul2IWzRTnU//VJ67gq+KF q85mMLu0fGmWzI9l8S+vwgqKvw72u5eaJIJLY7SpIomsNU1B5r0b8uouwW6M5Wyt Wxk+RWG/r4HedJKLNG9ciG2yKHKYajtmd7sOsPj9R742o0gm80OaccyswQR8JE1Z fdoB441DB0i/xu2XRrdxE95g0BXWzHQasxxZR7WdaeaUOu077vbMdrwc6T/emcsi YR0nvdfJGmnzu0B2f/qER9kSpxvOjiTKtcfsJeFrxIdnOoakZ7syy8Lqejvc8oL0 0oTBovx8 =aB8K -----END PGP SIGNATURE----- --kohwzcydal6k6hzl--