Date: Wed, 4 Sep 2024 14:28:52 +0200 From: Mathieu Arnold <mat@freebsd.org> To: Gleb Popov <arrowd@freebsd.org> 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> In-Reply-To: <CALH631m0312DGO69UDiptu%2B45Gg59mxZp8o-5eptOopBUQdG8A@mail.gmail.com> References: <202409041000.484A0AcN013930@gitrepo.freebsd.org> <CALH631m0312DGO69UDiptu%2B45Gg59mxZp8o-5eptOopBUQdG8A@mail.gmail.com>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On Wed, Sep 04, 2024 at 01:28:45PM GMT, Gleb Popov wrote: > On Wed, Sep 4, 2024 at 1:00 PM Mathieu Arnold <mat@freebsd.org> wrote: > > > > The branch main has been updated by mat: > > > > URL: https://cgit.FreeBSD.org/ports/commit/?id=06757954d9e3de9472361b4e8db6ffb991c8dcea > > > > commit 06757954d9e3de9472361b4e8db6ffb991c8dcea > > Author: Mathieu Arnold <mat@FreeBSD.org> > > AuthorDate: 2024-09-04 09:56:45 +0000 > > Commit: Mathieu Arnold <mat@FreeBSD.org> > > 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. > > But because you squashed these two changes, it can't be reverted with > a single git command. > > 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 <commit> - changes back the changes you don't want to revert - change files so that it builds - git commit 2) a variation - git revert <commit> - 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 <commit> > 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 <commit> | git apply -R - revert whatever you don't want in - change files so that it builds - git commit 5) get files manually - git checkout <commit>~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/logseq/files/Logseq.desktop textproc/logseq/files/Logseq.in textproc/logseq/files/patch-resources_app_node__modules__logseq_rsapi-linux-x64-gnu_package.json textproc/logseq/pkg-descr textproc/logseq/pkg-plist ; do git show <commit>~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. -- Mathieu Arnold [-- Attachment #2 --] -----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-----home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?43f6truiktdu445ghpxvlbgpu2g37liqltnkpjpo33jcgbuty4>